| commit | 38e3b3ba91947180c6939e635e9a24fe693d736d | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Thu May 19 07:17:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 07:17:57 2016 +0000 |
| tree | 09dad2a0c295ca6d6d0ac8eadb35e91732df4556 | |
| parent | 03307df369e87f737a3f0086de0c6f0081b65719 [diff] | |
| parent | 1b9a930ba4a5884b01b9ebf6b92065a55c689dec [diff] |
Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 1b9a930ba4 * commit '1b9a930ba4a5884b01b9ebf6b92065a55c689dec': Fix build breakage caused by redefining attrs Change-Id: Iae28ff991e2dc154db009f75da45f7aa25ada5d2