Yohei Yukawa f3956983a6 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am: 1061992733 ...

am: 7f5b18356c

Change-Id: I44a3d6e304270fa1d53953aac0eaf8d42d748615

2017-04-03 22:31:13 +00:00

..

java

Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am: 1061992733

2017-04-03 22:31:13 +00:00

jni

Merge "Camera: add batching support to HAL1 recording path" into oc-dev am: e1df48d3a0

2017-04-03 17:34:03 +00:00

proto/android

…

res

Merge "Squashed merge of master-sim into master."

2017-04-03 20:26:59 +00:00

tests

Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev am: ef7dff2563

2017-04-03 20:01:58 +00:00