Jim Miller 6a31d15efb Merge changes I254d6fc6,I360e9ac7 ...

* changes:
  Move keyguard to its own process.
  Move keyguard source and resources into new package

2013-02-28 03:30:45 +00:00

..

java

Merge changes I254d6fc6,I360e9ac7

2013-02-28 03:30:45 +00:00

jni

am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."

2013-02-27 20:09:25 +00:00

res

Move keyguard to its own process.

2013-02-27 17:27:53 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00