| commit | 6b717c66a70663ea9d8b972289a8d4d74d90bc5a | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Fri Jun 05 01:35:13 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 05 01:35:15 2015 +0000 |
| tree | 76d4392425934d9e24472d236cdb0fa9e877e024 | |
| parent | 0ccc940a0db0f6a779ed2cbc0f24a395046536e0 [diff] | |
| parent | 8c831ca87bb7c8699b2a5cb34b8d35deedf9ce4e [diff] |
Merge "AAPT2: Add manifest merging" into mnc-dev