OSDN Git Service

Merge "Removed the deprecated screen state API" am: c10809781f am: 01504d76c6
authorJack Yu <jackyu@google.com>
Tue, 7 Mar 2017 02:49:14 +0000 (02:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Mar 2017 02:49:14 +0000 (02:49 +0000)
am: 0af2e62449

Change-Id: Icd65c95b4a615b054a97e7fc4eb4e7c429bca70d


Trivial merge