tree 17a5b6443943f2d5aa04016c575f7fb09ffb6caa
parent 75510f13464dba80fb7ac70d731a899e85ee7cae
parent 8ed75e5c1606d4bd1218e2e3975527e1719d9be6
author Sunny Goyal <sunnygoyal@google.com> 1424898950 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424898950 +0000

am 8ed75e5c: am 7470c817: Using SCREEN_ORIENTATION_LOCKED for locking to current orientation.

* commit '8ed75e5c1606d4bd1218e2e3975527e1719d9be6':