commit | 5261d41d37f120b62b7aa78d1b47b3805bb44df9 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Mon May 19 18:12:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 18:12:30 2014 +0000 |
tree | e18b61533ddc7effc8263140f0549e9f913a15ac | |
parent | 82eccf61f35cb8b9eb0c524c28841147f646e353 [diff] | |
parent | fde47a0828fc20bcb6299e67b562d64a4826d264 [diff] |
am fde47a08: am 719a1e11: am f47c157e: 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 'fde47a0828fc20bcb6299e67b562d64a4826d264': Port the native scanner to cts_v2 bug:14792033