| commit | 5b322d4e4e551af2378bc78bd046d0dcea8a9226 | [log] [tgz] |
|---|---|---|
| author | Jeffrey Vander Stoep <jeffv@google.com> | Sun Oct 08 04:18:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 08 04:18:54 2017 +0000 |
| tree | 846faaa92eb03d698d962ee6a33b8682a4b0b66d | |
| parent | 6eef5589d2cc3562516f724788661f54e8d8d85a [diff] | |
| parent | a08b925aea239f0cf64fcc1c0b847ea47f0f2566 [diff] |
Merge "Allow redeclaring typeattributes" am: dcee57b8c2 am: 7242f16830 am: a08b925aea Change-Id: Iadeb02947c4aefd1821b8e3294ad9fd801f8b0c1