Nick Desaulniers aeb2e1e91b resolve merge conflicts of 9db1877 to master ...

Change-Id: I12e14d374ab4f71d931ea2cb449354fdf42db004

2016-07-27 15:36:01 -07:00

..

res

Import translations. DO NOT MERGE

2016-07-20 14:50:29 -07:00

scripts

…

src/com/android/keyguard

resolve merge conflicts of 9db1877 to master

2016-07-27 15:36:01 -07:00

test

Build SystemUI and Keyguard with AAPT2

2016-07-07 12:23:02 -07:00

Android.mk

Build SystemUI and Keyguard with AAPT2

2016-07-07 12:23:02 -07:00

AndroidManifest.xml

…

NOTICE

…

proguard.flags

…