| commit | 475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Thu May 19 07:15:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 07:15:01 2016 +0000 |
| tree | 84030ce51ec4de8b737b991aaed6c49443a7fec2 | |
| parent | 8958153ac7921349dd8770a33484ca96581277cc [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: I0663ec408eec497c64c35a9c7d6f43e223c3cc22