OSDN Git Service

Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into...
authorJulius D'souza <jdsouza@google.com>
Thu, 1 Dec 2016 22:57:50 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Dec 2016 22:57:50 +0000 (22:57 +0000)
am: deb3516131  -s ours

Change-Id: I253cc1415c43facdb2252d4b2f57fc9c682db43f


Trivial merge