tree bedf801fb9f69c06f9d6400f0df24b6cd108459a
parent ff122e750c90c5c076107a636f9529a5796677b6
parent 0b138595de60fc4a17390b37dc7151f250b2e587
author Wale Ogunwale <ogunwale@google.com> 1498268155 +0000
committer android-build-merger <android-build-merger@google.com> 1498268155 +0000

Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am: 0b138595de

Change-Id: Icaaaca9735c18d10dcb414c82d2b6833c95ab6e9