commit | 3bcd87eed50de966ddc7b942220cd06a21f3ba9f | [log] [tgz] |
---|---|---|
author | Jeffrey Vander Stoep <jeffv@google.com> | Sun Oct 08 04:08:45 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Oct 08 04:08:45 2017 +0000 |
tree | 9538d0150564a34c22ad593edcee9846f64a997d | |
parent | e12aae00b97cd9bcfb811a619fc4d44813e04c63 [diff] | |
parent | dbbfc08b7427c39e51089ea6218b30fe69fbf5ef [diff] |
Merge "Allow redeclaring typeattributes" am: f8bc6cee3f Change-Id: I119e687a3aaf397ac38365728f6bf9e7c24c1067