| commit | 22384b57bdfee87368417ecc2eb7728fd6f4dd2e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 12:17:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:17:49 2013 -0700 |
| tree | 650a3933812ee28c5971337f34358636e40ae788 | |
| parent | ef86bbceaef53acbb4e56e2fa45a7dd0e3c2ccdb [diff] | |
| parent | 0ed901ff17f583f37d0262e10d5590c80c23fc93 [diff] |
am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':