| commit | dedce805ec541aa8c33c56544c62a24530e9b929 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:21:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:21:27 2012 -0800 |
| tree | c22f6dea81ef5ebf7217772403d7db25a2214adc | |
| parent | d80feca57491026dc6680d345e4eab86a2ea8598 [diff] | |
| parent | 52d02199e8cf43ca90aaffc7f4203088a4f0f135 [diff] |
am 52d02199: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '52d02199e8cf43ca90aaffc7f4203088a4f0f135':