| commit | 0b12fc6a9e5209422fe22f0b3e1202d9f272dff4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:18:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:18:46 2012 -0700 |
| tree | 42c248cb37f60ac06bf1e7e9bb49f27d88e427a5 | |
| parent | 97c6ecdc2570856a0332a8f91b656c0e12972b05 [diff] | |
| parent | c0b009989e424c923826d7c920c3fc5af5786770 [diff] |
am c0b00998: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c0b009989e424c923826d7c920c3fc5af5786770':