| commit | bd7c30a5ea64d1977a6e6a47a270e015034b3ca5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:40:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:40:06 2012 -0700 |
| tree | b88c6115147083b544f1493f5ae04c7fbf314ab1 | |
| parent | 09bdd38ba65458c07faf61693eb6f95cf56a0921 [diff] | |
| parent | c7314cea25a040536048bf19515c8fa9e22fee95 [diff] |
am c7314cea: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c7314cea25a040536048bf19515c8fa9e22fee95':