| commit | 54d77364f4819df87d076be7a9754d4d03a223b1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:37:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:37:20 2012 -0700 |
| tree | f641f279b761815507493003f851dc628362a748 | |
| parent | 47d9f7faee135c5ddf4e23b913538d98d8977702 [diff] | |
| parent | 95bd5ab91211e208b1080b3fa0696b75838d7b4f [diff] |
am 95bd5ab9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '95bd5ab91211e208b1080b3fa0696b75838d7b4f':