| commit | 970b8b3fa98f67961a9afdaa63899f8df074db1a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 08 15:45:50 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 08 15:45:50 2013 -0800 |
| tree | 65787c432b76178f0d37aeedd48a843292a1b0fa | |
| parent | 97dcc20e6d6fcce712ab1101bfe03c74aa2b6682 [diff] | |
| parent | 4b71a472c0f254606e93b8f9f86f7df0e6dba522 [diff] |
am 4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (2) and The Android Open Source Project (1) * commit '4b71a472c0f254606e93b8f9f86f7df0e6dba522':