Jeff Brown f347bc39fc am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master" ...

* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.

2014-05-02 01:26:29 +00:00

..

java

am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"

2014-05-02 01:26:29 +00:00

jni

Merge "fix AudioTrack and AudioRecord JNI"

2014-05-01 23:49:51 +00:00

res

am 1ae785c1: am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev

2014-05-01 22:54:04 +00:00

tests

Add unit tests for InputMethodSubtypeSwitchingController

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