| commit | a08b925aea239f0cf64fcc1c0b847ea47f0f2566 | [log] [tgz] |
|---|---|---|
| author | Jeffrey Vander Stoep <jeffv@google.com> | Sun Oct 08 04:12:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 08 04:12:54 2017 +0000 |
| tree | 329779a8a22b54a23de2f6d1f18752168a6795ff | |
| parent | cbb0543d3f836cd20708caca217fd03aac4071df [diff] | |
| parent | 7242f16830d844752ffa3dacbb0ea73ad76a8ea3 [diff] |
Merge "Allow redeclaring typeattributes" am: dcee57b8c2 am: 7242f16830 Change-Id: Iaf37d2a4391f64fb76f1a2a51aa9077ba81be224