| commit | 9782ac58146eff0fa10cd4a93c9d890d5cf47fb9 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Wed Apr 03 17:58:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 17:58:56 2013 -0700 |
| tree | c2f1806960e4e6e5cdf5597ba41375344e5feaf4 | |
| parent | 148c7bda2d777ac01bf21c9e316adcb1ba91d2da [diff] | |
| parent | 5a513a5f86c0497e0d1ac74cce86140676999b29 [diff] |
am 5a513a5f: (-s ours) am 37388df7: am a419aef2: am 8c1ee69b: DO NOT MERGE resolved conflicts for merge of 317bb63c to jb-mr1-dev * commit '5a513a5f86c0497e0d1ac74cce86140676999b29': DO NOT MERGE verifier to R6