| commit | 1e6cb5a8f26420bf94c6bc194d95002d9366caa4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:30 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:30 2013 -0700 |
| tree | 098e78cb209cb21ff6d1b0e55bb233dfbed6ce92 | |
| parent | d8ef19b0c8a57daea726ad93edbbe396b9e9f5d3 [diff] | |
| parent | 8168ebb464459740047e5d8424141dd5bc1b045c [diff] | |
| parent | d6ab7c62efd634f822233567e050fa091fa4b324 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237