| commit | f0e341b44949564de0d33361c1284b8aff19a8bd | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:22 2015 +0000 |
| tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
| parent | 3ac4765a14334f0aa574b5cffb5349cc1c214cfe [diff] | |
| parent | 5391dfdb35221f782a4d0da29e31f4725dc507d3 [diff] |
am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" * commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':