commit | 7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:52 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:52 2013 -0700 |
tree | b5c09fa4dd1048cad379189e094f7a54a7978260 | |
parent | b528e2511377b58f2c7e0d1046b3645a3716e0ab [diff] | |
parent | 5fb6a99bd6a41f26d27a77400ab41087b9248fce [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38