| commit | 0cfade446034fbf7d947b164d83dabaa194665c3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:13:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:13:15 2012 -0700 |
| tree | cc6700ab261fe21cb2982850ec7c3536a29d234c | |
| parent | bab6c021bde26e0cd78063103137a3e6aa05421d [diff] | |
| parent | 97652731272a54eb318d835387e73c325440dcd0 [diff] |
am 97652731: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '97652731272a54eb318d835387e73c325440dcd0':