Fan Zhang d0f2f3dee5 resolve merge conflicts of 111b81d to master ...

Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d

2016-08-22 17:26:34 -07:00

res

Fix the nullpointer bug in monkey test. am: 409c4708c1

2016-08-22 22:32:17 +00:00

src/com/android/settings

can open settings with support tab by default am: 12c5208ad0

2016-08-22 22:32:20 +00:00

tests

resolve merge conflicts of 111b81d to master

2016-08-22 17:26:34 -07:00

Android.mk

Build with AAPT2

2016-08-17 10:19:00 -07:00

AndroidManifest.xml

Merge "remove duplicate permissions"

2016-08-18 23:25:04 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%