| commit | d249cddca6408c5fe2b02c1bbf094f050c5fda57 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:11 2012 -0700 |
| tree | 817f745f708fee6cf24ef68e8f183872427531a0 | |
| parent | 23964303b4b82fac3766f067d9f8e2dd1f56be96 [diff] | |
| parent | 62edaa59a58b2d73c6a42a80fc4794f52d78c6e2 [diff] |
am 62edaa59: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '62edaa59a58b2d73c6a42a80fc4794f52d78c6e2':