| commit | d9de2f6652a8a7f7d5b348bccd7b842ac3d5716d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:37:02 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:37:02 2012 -0800 |
| tree | 152f4e6a2a5321b923fb5a502b6d62bbdd515e42 | |
| parent | d5c3cb5f23429cf4e1c7b08c5e926174a64b4703 [diff] | |
| parent | bb07779818b583ec6d0b73c4062f485751332c81 [diff] |
am bb077798: Reconcile with jb-mr1-release - do not merge * commit 'bb07779818b583ec6d0b73c4062f485751332c81':