| commit | 0f41e62c8c2e0b2b8b936bebbd787533c662ec81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:41 2012 -0700 |
| tree | ce1fb6c348e8ce9e05a1e939d21c7d0911762637 | |
| parent | 954cd7cea7e34657c11a616ecc1c966bb2a8752a [diff] | |
| parent | bc168b5475b4484a4880d439d2e04201e24a6e46 [diff] |
am f0e55de3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f0e55de3b1b099c413d430d8f9d46361454c85d2':