| commit | 44ec1422886bf245fe4610ce2a23ce0bc436f903 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:05:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:05:57 2012 -0700 |
| tree | 17a7d0ccad81c22f59b0eb63ced847e7e394d5f6 | |
| parent | 315b4e7957fc7a3e73a52356b49ea20cfa6f7764 [diff] | |
| parent | d2cd0f05a2ba440d0d55cb15ca8c575b25ecb377 [diff] |
am d2cd0f05: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd2cd0f05a2ba440d0d55cb15ca8c575b25ecb377':