commit | 47f31b19811a177baa1ae868282374970295caeb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 09 17:13:32 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 09 17:13:32 2013 -0700 |
tree | 3610434840f2e9041aa92ce746e9b28cd917804b | |
parent | 54d97c88b57d2c341f0629c9648d4400a34e4f41 [diff] | |
parent | 439b197dbef6b3643ffb7da766e261a04ffaf354 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01