tree 91ece255d7a20a5b47b97df421496772769b5b61
parent ae2a0e0918cf63940f4e785690933aaebe3b3139
parent 6639e2fc3abb3504f2439a1b0b0997b299975104
author Andrii Kulian <akulian@google.com> 1463642810 +0000
committer android-build-merger <android-build-merger@google.com> 1463642810 +0000

Merge "Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c" into nyc-mr1-dev-plus-aosp
am: 6639e2fc3a

* commit '6639e2fc3abb3504f2439a1b0b0997b299975104':

Change-Id: I0092cb12ff7edaa1cee843cf925116d29d5f33dc