| commit | 37388df709e7c2d5e70038cdb2e6a56cc96ad2e4 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Wed Apr 03 17:51:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 17:51:15 2013 -0700 |
| tree | dc4b61d860666e8b7f51316cd815a8af78fe8ac8 | |
| parent | a730c7316f0bc502e69999e683ad5d615e2ceaa6 [diff] | |
| parent | a419aef2af5a8c987302c658df5fd92635a46d09 [diff] |
am a419aef2: am 8c1ee69b: DO NOT MERGE resolved conflicts for merge of 317bb63c to jb-mr1-dev * commit 'a419aef2af5a8c987302c658df5fd92635a46d09': DO NOT MERGE verifier to R6