| commit | f64bd473e4c500dc54923baac7261e6d2d72daa6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:42:56 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:42:56 2013 -0700 |
| tree | 39fe6bd6d01054e9923e1a167eb826b3f564e387 | |
| parent | 0eefffd8fc8abfbe694814fcec397aeac3f545b8 [diff] | |
| parent | 1b88b416440786a09519d0b94884149d46ca4438 [diff] | |
| parent | fc99165001048eac94aefbf29bcae5071493d484 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf