commit | 9d42e438cb86a398bd1f9255a7ede35e8c455139 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 07 09:43:07 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 07 09:43:07 2013 -0700 |
tree | eba58f29a88674934e8fdbe5c475297c62ee0563 | |
parent | 53d86f6e495e3f950191419645e34970779a3fea [diff] | |
parent | 1d3ff5b4546a0ff4bcc6af61ff3c7b024cbac656 [diff] | |
parent | 6037ec56af9b38bc5603dc0073a0d8411b948294 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d