| commit | be2f9632b83968f7179750615625306ecdac7fda | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:31 2012 -0700 |
| tree | 63f9710c0ce3973af53fe3002d04d833483961b0 | |
| parent | 96d2164f9cc8da112f7c5d6cfe95ec48d97df2ad [diff] | |
| parent | 73946166007738852836243276d1f9041912dd89 [diff] |
am 73946166: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '73946166007738852836243276d1f9041912dd89':