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