commit | 2480debbb932d211008780ba30988c3e3977a3fe | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:52:48 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:52:48 2012 -0800 |
tree | 9d862cdbac04478028e0e8b7ca2ee1fe5090631e | |
parent | de6743d8e3a45275cc5e78bb18df8832b42e50c4 [diff] | |
parent | 9351269eae866a513e058796c6a4aecb8ecb7ee2 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ibe22e1f71d4641aeb6a31e0609d2414e4333ac3a