OSDN Git Service

Merge "Floor height API changes." into oc-dr1-dev
authorOkan Arikan <okana@google.com>
Fri, 9 Jun 2017 16:54:44 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 16:54:44 +0000 (16:54 +0000)
am: 2717eaba05

Change-Id: Id5783b9713cda9a5b1c62499a29322af3e86630c


Trivial merge