| commit | ae2a0e0918cf63940f4e785690933aaebe3b3139 | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Thu May 19 07:20:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 07:20:59 2016 +0000 |
| tree | 91ece255d7a20a5b47b97df421496772769b5b61 | |
| parent | f5e2e9756e668b198300ff06f1f96dc316638783 [diff] | |
| parent | 38e3b3ba91947180c6939e635e9a24fe693d736d [diff] |
Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 1b9a930ba4 am: 38e3b3ba91 * commit '38e3b3ba91947180c6939e635e9a24fe693d736d': Fix build breakage caused by redefining attrs Change-Id: If6fc6cae40fffcbd3d968efdea3715f7c7255030