| commit | ac2e710afe3f1a5059710135da8c5a256fa41024 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 06:02:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 06:02:20 2012 -0700 |
| tree | 9cd528aeb893f4fa1505d5cfa4863ce936a160e2 | |
| parent | dfe087fce569ec6843a4f8c30a9d65533c085ab1 [diff] | |
| parent | af503b044475dc29ce58f715739158036807e94e [diff] |
am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'af503b044475dc29ce58f715739158036807e94e':