| commit | bc9725e38991bbce9f6abb5710b20e76c4444d62 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Sat May 17 19:09:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 17 19:09:48 2014 +0000 |
| tree | 261f6ee8cc1d9ad88ca0ff14b96926358b6a7cb8 | |
| parent | 1d190b4aa712ee8a3df3803951294e1b36a71f65 [diff] | |
| parent | 15730ebcf906e2ab0a2ce051b73bd717c8e8d300 [diff] |
am 15730ebc: am 4459b239: am c0cca615: am b9acaba7: am e7648427: Merge "Port the native scanner to cts_v2 bug:14792033" into jb-dev * commit '15730ebcf906e2ab0a2ce051b73bd717c8e8d300': Port the native scanner to cts_v2 bug:14792033