Jorim Jaggi 7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev ...

* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous

2014-11-26 19:42:19 +00:00

..

res

Import translations. DO NOT MERGE

2014-11-26 06:39:40 -08:00

scripts

…

src/com/android/keyguard

Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev

2014-11-26 14:07:21 +00:00

test

Add device locked API for TrustAgentService

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

Android.mk

Remove now defunct touch analysis facility

2014-06-02 23:48:29 +02:00

AndroidManifest.xml

Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"

2014-04-14 17:54:22 +00:00

NOTICE

…

proguard.flags

…