tree b2105ab2b723ef704aff1c1e01b662713c7e1706
parent 5f309c6fd3763ba9b56ff3a175186d1e42ad5b8c
parent 210276d95389992c6d13e23cda5cc9baa393bdcd
author Android Build Merger (Role) <android-build-merger@google.com> 1500074479 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500074479 +0000

Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 6c5ee3d894" into oc-dr1-dev-plus-aosp