| commit | c165d9c9ba066d61fa82076e12c496e34b2177fa | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Sep 19 15:41:15 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 19 15:41:15 2017 +0000 |
| tree | 9f6010bf82c2f61491a8aaf34684746ddb0a4e4b | |
| parent | 4971146b2b27002461df4c043e6d6dc5e7f0215b [diff] | |
| parent | 34054eb61594420523520380ea4dea44ff9b9746 [diff] |
Merge "Revert "Upgrade to ManifestMerger2""