Adrian Roos e3b07451c3 resolved conflicts for merge of bcc26c02 to master ...

Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388

2015-08-21 18:08:58 -07:00

..

res

Import translations. DO NOT MERGE

2015-08-19 06:53:44 -07:00

scripts

…

src/com/android/keyguard

Add StrongAuthTracker

2015-08-21 13:28:00 -07:00

test

…

Android.mk

…

AndroidManifest.xml

…

NOTICE

…

proguard.flags

…