| commit | 3f7fd9e2303c7b323c3f67ffbbae87f46587945d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <[email protected]> | Tue Jun 25 16:13:03 2013 -0700 |
| committer | The Android Open Source Project <[email protected]> | Tue Jun 25 16:13:03 2013 -0700 |
| tree | 1829bd2a124df7fdda932bb26923abb6f2a549bf | |
| parent | 4dc84014d0ff9bbdab05c683228f6c51d5fa218a [diff] | |
| parent | 8ad47444e94fd70418a33441ccfe89a64a5cbbb6 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I88e6cf7ec1cc93a219e8227ad59aef4175ca64aa