| commit | 825d3550708c73a586cb380b774dbd6ae12cfd1a | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jan 05 16:14:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 16:14:40 2015 +0000 |
| tree | c407e477e080d9b46e211594b9020164245facc6 | |
| parent | 7e5e64008d2bb79b894af0ca025dc3e7d3c1b757 [diff] | |
| parent | b4d460b11db6c16f921b0badae29ec684f079d15 [diff] |
am b4d460b1: resolved conflicts for merge of 3701548f to lmp-mr1-dev-plus-aosp * commit 'b4d460b11db6c16f921b0badae29ec684f079d15': ext4_utils: Support -L LABEL option on mkuserimg