| commit | 7672e13024f29169f2ef9743e076758d5e569766 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 29 08:10:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 08:10:32 2013 -0700 |
| tree | 952f8fbcee2632f0f962f556c03fff83c65765c0 | |
| parent | 84232014fb4627850bc62f8616972640e767accb [diff] | |
| parent | 216e1143ece02caa96585834311349936cef4e9a [diff] |
am 216e1143: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '216e1143ece02caa96585834311349936cef4e9a':