| commit | a419aef2af5a8c987302c658df5fd92635a46d09 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Wed Apr 03 17:48:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 17:48:10 2013 -0700 |
| tree | 42ae0ebe8ca83ca7d14ad5a2b023f8bd305ee495 | |
| parent | 44bbe590b9638cd03461e498db8ab2b2ce719914 [diff] | |
| parent | 8c1ee69b2a023642d0d7ac6d1075b3053910fc84 [diff] |
am 8c1ee69b: DO NOT MERGE resolved conflicts for merge of 317bb63c to jb-mr1-dev * commit '8c1ee69b2a023642d0d7ac6d1075b3053910fc84': DO NOT MERGE verifier to R6