commit | fe3c9161d370584891d7c41515ce28d2405026ed | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:55 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:55 2013 -0700 |
tree | a6933297e5f7a4865424596f01a9c61d5e89c174 | |
parent | 358e203d678c19250dd5f3f00e19bfad37053a04 [diff] | |
parent | 3f91efa809e3b291d349a47c7cb4d0e95d201728 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I19ae00132e4e0709be4b71735de8f1ada12962a4