| commit | bbe44d3c88ca8484befb8446d090f7d069f9e7e3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <[email protected]> | Tue Aug 20 14:49:09 2013 -0700 |
| committer | The Android Open Source Project <[email protected]> | Tue Aug 20 14:49:09 2013 -0700 |
| tree | aa7aa45add93981dff17b8f9fc31046dea0205fa | |
| parent | 3f73173fcc2d8671b60591276a6072dade44131a [diff] | |
| parent | 1d96695b113c9a2144743ce45e65eb53828f90ec [diff] |
Merge remote-tracking branch 'goog/jb-mr2-zeroday-release' into HEAD Conflicts: fstab.deb init.deb.rc