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

..

java

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

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

jni

am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks."

2014-11-25 23:35:47 +00:00

res

am 93ca215b: am 8311f4d5: am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev

2014-11-26 19:41:39 +00:00

tests

am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE"

2014-11-26 18:14:34 +00:00