commit | e2ae01114dac2abecf3aeed1d6fb13bdcfb93a7b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:04:15 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:04:15 2013 -0700 |
tree | b3e734a716e9a885ef2ee0d95fb9b1a93e535024 | |
parent | 80d56531103249f103d7cb680cd431b059ff1d43 [diff] | |
parent | 5ac124384f6090f48fb0be5e8a80ad8fd792b87f [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839