Jason Monk f8830fc514 am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev ...

automerge: 9309db8

* commit '9309db894df916f0777745eaa3e41ab92930481d':
  CarrierText clear itself when no mob. data support

2014-12-10 19:09:42 +00:00

..

res

Import translations. DO NOT MERGE

2014-12-10 06:31:09 -08:00

scripts

…

src/com/android/keyguard

Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev

2014-12-10 14:25:39 +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

…