| commit | b3c81e3f6c3d41ab6220ba91808b04d758dccba1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 28 09:47:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 28 09:47:35 2012 -0800 |
| tree | 825e72bcf8cd6d4219d1463e175631d4a5f8a96d | |
| parent | 8d3a44bcb09a5a68d1f00a49db02b306633b2ea7 [diff] | |
| parent | 57ebeed61fd7b1a8fb8d1d8d719c10dfabd8aae4 [diff] |
am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '57ebeed61fd7b1a8fb8d1d8d719c10dfabd8aae4':