| commit | c0cca615363b973baf450c6802cb68f70d8cd036 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Sat May 17 18:57:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 17 18:57:04 2014 +0000 |
| tree | 889a7037afb5170885745c0251d78eb65cb710b9 | |
| parent | 1217b9dc1481d5561fe5a226aef8c5d1a6588211 [diff] | |
| parent | b9acaba7819062d35a1a58e4ec3f83f2f1b7f718 [diff] |
am b9acaba7: am e7648427: Merge "Port the native scanner to cts_v2 bug:14792033" into jb-dev * commit 'b9acaba7819062d35a1a58e4ec3f83f2f1b7f718': Port the native scanner to cts_v2 bug:14792033