| commit | 121238c827e8ba6511d6c4be1cd73e0ad97ad015 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Sat May 17 19:20:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 17 19:20:34 2014 +0000 |
| tree | b4a631b63e23502857c1c5dea15e3de5a47468f2 | |
| parent | 3583c34bea233017e6e69666f156e319fe026a5e [diff] | |
| parent | 983311944058cec3cc01182fae27b5963934ca18 [diff] |
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 '983311944058cec3cc01182fae27b5963934ca18': Port the native scanner to cts_v2 bug:14792033