| commit | 471ce2c94a65cf4393de56418c7d96181801d8f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:06:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:06:28 2012 -0700 |
| tree | 886e6b8e16ce46d7f2e2c3116dffe53509d5b3f3 | |
| parent | 7b833420c3a6adf07597a65223bd17997dc30fbc [diff] | |
| parent | ed14f90b34b05986096b5e7e77d6ea205c96b4fe [diff] |
am ed14f90b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ed14f90b34b05986096b5e7e77d6ea205c96b4fe': JOP11