commit | ceb5dea905af4cb348aab1a7beb55b8389033970 | [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 | add19af4f7f2a31486794c8c2c1719c6200474e0 [diff] | |
parent | f8bc6cee3f006de80783e965f11b10850740588f [diff] |
Merge "Allow redeclaring typeattributes" am: f8bc6cee3f Change-Id: I119e687a3aaf397ac38365728f6bf9e7c24c1067