commit | b7559e571ba41712fe0b4f72379b31a640055591 | [log] [tgz] |
---|---|---|
author | Jeffrey Vander Stoep <jeffv@google.com> | Sun Oct 08 04:12:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Oct 08 04:12:41 2017 +0000 |
tree | 639837960d16139bdadf87618ed9d7b846cf6e5d | |
parent | 06e0c62cb4df44da58f03ff6e72d0bcaf80b8041 [diff] | |
parent | ceb5dea905af4cb348aab1a7beb55b8389033970 [diff] |
Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905 Change-Id: I59283077344f07c325f49da191c291f69b8ac1ae