Andrii Kulian ae2a0e0918 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

2016-05-19 07:20:59 +00:00

..

assets

…

res

Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 1b9a930ba4

2016-05-19 07:20:59 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Merge "Update docs for DELETE_PACKAGES permission." into nyc-dev am: 0e351a945b am: ca8ecc0be1" into nyc-mr1-dev-plus-aosp

2016-05-10 20:39:14 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…