| commit | d8d0c17e22f42597497e8f9f5c134621e399e22a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:27 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:27 2013 -0700 |
| tree | 00c2d5d58bef976749ab01d29b4786046117dcfa | |
| parent | 7c8042a39858bc42e3eb5ede616acbee7e8a3f06 [diff] | |
| parent | c80dc3e407c6c5455ec43c06e861f79b2ef66c2b [diff] | |
| parent | e17c7f4324a64fa260aaece10cb8565a659663c7 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448