| commit | 6edc30923dd510ba6683ce65ab92b33d0c5155f3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 13:00:50 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 13:00:50 2012 -0800 |
| tree | b08f3d4060a25c39f399517074ac61fc69bece72 | |
| parent | 7a02e9bcb88ee08e68083435441ec26c56b4e8be [diff] | |
| parent | e88b60b61d85172ccd575f9697978a22f646afb8 [diff] |
am e88b60b6: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e88b60b61d85172ccd575f9697978a22f646afb8':