| commit | cde60564c954dfd26b33223967a49385ef8d92ed | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 08:23:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 08:23:51 2012 -0700 |
| tree | 3171014a8a73f77c618d8be6a92174a62787e050 | |
| parent | b5eeda968988a84935d07509f677b5693b112741 [diff] | |
| parent | a8293416f518a38b94ae6b39efc7490d34f09e85 [diff] |
am a8293416: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a8293416f518a38b94ae6b39efc7490d34f09e85':