John Spurlock a4a5ba71c1 am cf21f77a: Merge "Implement long-term condition subscriptions." ...

* commit 'cf21f77a6973e292714af879c36706aa51a8e790':
  Implement long-term condition subscriptions.

2014-05-01 19:21:37 +00:00

..

java

am cf21f77a: Merge "Implement long-term condition subscriptions."

2014-05-01 19:21:37 +00:00

jni

am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

2014-05-01 10:27:18 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-05-01 16:18:18 +00:00

tests

Add unit tests for InputMethodSubtypeSwitchingController

2014-05-01 19:13:25 +09:00