commit | 4edec272e49c0ddc4ed82adeafe19dc5699bed3f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 24 15:28:19 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 24 15:28:19 2013 -0700 |
tree | 35e63eb4562d505b5bfcea6eb91a1d9ab6d61f74 | |
parent | 3a004ee4a0d5bdaec917cb19e889daf75a42a998 [diff] | |
parent | 6a2f4639c69b153f8d411ed5169745054656a7b0 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917