| commit | fde47a0828fc20bcb6299e67b562d64a4826d264 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Mon May 19 18:08:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 18:08:36 2014 +0000 |
| tree | 2ecd891befdc18c9a41bcce01440fd76b84c6c95 | |
| parent | 3c59e8e476541e4456323c62f0d09d59dacdcf8c [diff] | |
| parent | 719a1e11e7aa5cb45ef65b05b1cb749ec4d108b7 [diff] |
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 '719a1e11e7aa5cb45ef65b05b1cb749ec4d108b7': Port the native scanner to cts_v2 bug:14792033