| commit | 6961109b2f446e92d969fe093b940f71c01a8b7a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:19 2013 -0700 |
| tree | 59f2b0c78237790b6aa4d070610020eca8ab6f18 | |
| parent | 9ac4be47317acb19a4077de3723118d879374018 [diff] | |
| parent | 20d28cb2dc069a17af843ce666420fc3702973e0 [diff] |
am 20d28cb2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '20d28cb2dc069a17af843ce666420fc3702973e0':