commit | 57d45b6039cd58964f8eec9b35ace0ae5475e12e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 16:13:36 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 16:13:36 2013 -0700 |
tree | f33745891a4668aa8601ba76fb274cb0036ac027 | |
parent | 090c669e69279c0dcbe5da2c262578b36a98ace9 [diff] | |
parent | e873a55d7348ea5ecee3a225eba12a8b399913d3 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I0dea6d4a409899be3ba89212b1c269f61db4b453