commit | 0c3de6aff3cceb6e041a46a12e596b8e8819aa15 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:44:19 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:44:19 2013 -0700 |
tree | db75554443f9082de088435e7f0afd7292a4ab3a | |
parent | 05a52055661701c20f71124161798fdea8ea2982 [diff] | |
parent | 1ccbcc963345042f7c965faba6d5b48192096ec1 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I4ec0a42f3e59ad0bc4d26ca2b1132ec55ce6fa6d