tree d5153165b12dacdaeabcf06ea8be4716d45f1c24
parent 91b440aaea97a61b277bfa6466edf3644e451aa0
parent 525db2489d8bb1204225e697171d3f18b6fc9695
author Adam Lesinski <adamlesinski@google.com> 1456442003 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456442004 +0000

Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev