| commit | 20eca4bef3e5bf903bf81b8b7fb0b91613588be8 | [log] [tgz] |
|---|---|---|
| author | Jeffrey Vander Stoep <jeffv@google.com> | Sun Oct 08 04:18:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 08 04:18:13 2017 +0000 |
| tree | 63b93a52871f418e1afedf6a4c79b641f0b25908 | |
| parent | dbfec914faa49cd7e933bca2637e2e453b99de16 [diff] | |
| parent | 4ba8c5287665270dfb9e10109d65d2aaed923d0f [diff] |
Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905 am: b7559e571b Change-Id: I093f8be7b4f8c810d4ffefab5461687bdc883ac7