OSDN Git Service

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev...
authorGeoffrey Pitsch <gpitsch@google.com>
Wed, 12 Jul 2017 17:14:40 +0000 (17:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 17:14:40 +0000 (17:14 +0000)
am: 804322ee01

Change-Id: I19c58b8be852ab0a705b02f02d0b712bfefd3458


Trivial merge