| commit | 97fc6dc2ba113ca857d25fbb04bc5a18e5296dce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 20 14:52:26 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 20 14:52:26 2013 -0700 |
| tree | 578fe59cee3b9695715ba71d96659c39dbb9931b | |
| parent | 79816e3f9dd6b9ba6ae4623f6d1274a973abea9f [diff] | |
| parent | d312e617057d90639afa8fd20bf895e008127189 [diff] |
Merge remote-tracking branch 'goog/jb-mr2-zeroday-release' into HEAD Conflicts: kernel