tree d1f8556c4c9e62aa29c02c037fbab9d206600270
parent 81090f083095710c7b3277dedc033a1ed9a58a97
parent c9c953da03347d96701a1e29f22e675ddee94d15
author Adam Cohen <adamcohen@google.com> 1316207842 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316207842 -0700

am c9c953da: am 446e940f: Locking orientation on phones (issue 4967793)

* commit 'c9c953da03347d96701a1e29f22e675ddee94d15':
  Locking orientation on phones (issue 4967793)