Commit f47c157e authored by Nicholas Sauer's avatar Nicholas Sauer Committed by Android Git Automerger
Browse files

am 121238c8: am 98331194: am bc9725e3: am 15730ebc: am 4459b239: am c0cca615:... 

am 121238c8: am 98331194: am bc9725e3: am 15730ebc: am 4459b239: am c0cca615: am b9acaba7: am e7648427: Merge "Port the native scanner to cts_v2 bug:14792033" into jb-dev

* commit '121238c8':
  Port the native scanner to cts_v2 bug:14792033
parents 0f1613c8 121238c8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment