| commit | c6e533e90df32fb62ee5097e72c09e1e86c4172c | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Thu May 19 07:18:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 07:18:02 2016 +0000 |
| tree | 09dad2a0c295ca6d6d0ac8eadb35e91732df4556 | |
| parent | 03307df369e87f737a3f0086de0c6f0081b65719 [diff] | |
| parent | 475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a [diff] |
Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c * commit '475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a': Fix build breakage caused by redefining attrs Change-Id: I9c6ef99d1bd7b4affeee500dc6a1b0eca1b84b5b