| commit | f47c157ea0775178baa01e850b10c57bf963ef18 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Sat May 17 19:23:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 17 19:23:37 2014 +0000 |
| tree | 39a926f0ccde413031a4a9b2b1418a5291280b4b | |
| parent | 0f1613c85b814e68d4d8a5072307400beb214e7d [diff] | |
| parent | 121238c827e8ba6511d6c4be1cd73e0ad97ad015 [diff] |
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 '121238c827e8ba6511d6c4be1cd73e0ad97ad015': Port the native scanner to cts_v2 bug:14792033