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