| commit | 7d95ce2c3d83aed8b89b95aeac9be4f268b1ae0d | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Mon May 19 18:23:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 18:23:33 2014 +0000 |
| tree | 798dc888e42fad4c1d2acd492afa564a7fcee175 | |
| parent | a4bb696c3c3e8268f7aaca7515f2a3ec196af57c [diff] | |
| parent | 5261d41d37f120b62b7aa78d1b47b3805bb44df9 [diff] |
am 5261d41d: 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 '5261d41d37f120b62b7aa78d1b47b3805bb44df9': Port the native scanner to cts_v2 bug:14792033