| commit | 1b9a930ba4a5884b01b9ebf6b92065a55c689dec | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Thu May 19 07:15:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 07:15:03 2016 +0000 |
| tree | 007f61bc8748610988c6e92fa3df8e279cbf3d56 | |
| parent | ae53fb4a436bcbb7deea668a26d2ba66bb4c5af3 [diff] | |
| parent | fa020a8094a08b5a26735c33c4ddaadcb51f99fc [diff] |
Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 * commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc': Fix build breakage caused by redefining attrs Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6