OSDN Git Service

Merge "Fixed an issue where the shade would jump" into oc-dev am: 1e2340da3a
authorSelim Cinek <cinek@google.com>
Thu, 1 Jun 2017 20:09:05 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 20:09:05 +0000 (20:09 +0000)
am: 84912122ce  -s ours

Change-Id: I76cfa4d88bbcd2bf5b95a7e79f59ae0638ebe132


Trivial merge