Peng Xu 09d2265a55 Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 7bef937503 ...

am: 5f309c6fd3

Change-Id: I03ff03b1ffe5e275f1551c3946eddc4fd766fd7b

2017-07-14 23:27:14 +00:00

..

java

Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 7bef937503

2017-07-14 23:27:14 +00:00

jni

Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413

2017-07-14 21:54:07 +00:00

proto/android

…

res

Merge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095

2017-07-14 20:39:22 +00:00

tests

…