| commit | 4a46258d6360c750150900032fef09b21c7c7d5c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:52:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:52:35 2012 -0700 |
| tree | 43b24f880d84a097bc99936c3a0aca6b65640648 | |
| parent | 88d46f61d48cdb549802f77d45fb97eb06529192 [diff] | |
| parent | 80db3afc271099f9b1cc5af4bb2ad15f1119a8ab [diff] |
am 80db3afc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '80db3afc271099f9b1cc5af4bb2ad15f1119a8ab':