| commit | b547e749d0edcac72980630b6b79c97af0cd6e70 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 12 14:16:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 12 14:16:40 2013 +0000 |
| tree | 3d7b9f6ac5ad0ef0605fc64c439e37c53e395982 | |
| parent | 43044c21172e76e441ac10909af2ceb705a9d1af [diff] | |
| parent | b10756cf6c650ead77de6cbeb8236fa61b4d9bb7 [diff] |
am b10756cf: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'b10756cf6c650ead77de6cbeb8236fa61b4d9bb7':