tree 34fc7710ded94b71aecfedd61a5462a2cf70a888
parent ff59f1e09c62fbd686f9a44ab0a2356e3503c93c
parent 0af2e6244931bad5d914690a334e093cce71de97
author Jack Yu <jackyu@google.com> 1488854954 +0000
committer android-build-merger <android-build-merger@google.com> 1488854954 +0000

Merge "Removed the deprecated screen state API" am: c10809781f am: 01504d76c6
am: 0af2e62449

Change-Id: Icd65c95b4a615b054a97e7fc4eb4e7c429bca70d