| commit | 4ba8c5287665270dfb9e10109d65d2aaed923d0f | [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 | 5ce2bfe8a810dbc6751395c0f4a54494cf10ca13 [diff] | |
| parent | 3bcd87eed50de966ddc7b942220cd06a21f3ba9f [diff] |
Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905 Change-Id: I59283077344f07c325f49da191c291f69b8ac1ae