| commit | f9fa705fd96320f156b661fd68b2925219636a10 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:24:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:24:34 2012 -0800 |
| tree | 7e7890a72aeb9693086434745f888876392c7eb5 | |
| parent | 6a8553a668782ddd79c344d415cc765c6a5893dd [diff] | |
| parent | 29df52f86c4f6683e4ed847bdbadf0a0bd240869 [diff] |
am 29df52f8: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '29df52f86c4f6683e4ed847bdbadf0a0bd240869':