Jorim Jaggi cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp ...

* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users

2014-11-25 15:04:28 +00:00

..

res

Import translations. DO NOT MERGE

2014-11-24 06:29:27 -08:00

scripts

…

src/com/android/keyguard

Merge "Fixed several time related states for secondary users" into lmp-mr1-dev

2014-11-24 11:52:40 +00:00

test

Add device locked API for TrustAgentService

2014-11-20 21:48:38 +01:00

Android.mk

…

AndroidManifest.xml

…

NOTICE

…

proguard.flags

…