Ying Wang 43d39a12f1 Merge "Fix typo in config.xml file" am: 738a557d54 ...

am: 84d1b18b7b

* commit '84d1b18b7be03f1e15b61adcb543d1a47dec5952':
  Fix typo in config.xml file

2015-12-18 01:50:38 +00:00

..

java

Merge "Make printing framework encryption-aware."

2015-12-17 23:04:18 +00:00

jni

Merge "Add temporary switch for new renderer in JNI"

2015-12-17 21:24:51 +00:00

res

Merge "Fix typo in config.xml file" am: 738a557d54

2015-12-18 01:50:38 +00:00

tests

TextView tests: open context menu on right click.

2015-12-17 08:19:56 +00:00