tree a0a266f97f0f06b7e6b8def3da32800abf17bd7f
parent 66fb1f3f3d8038d6bf216b52ba21a7e42fda040f
author Jeff Brown <jeffbrown@google.com> 1317841210 -0700
committer Jeff Brown <jeffbrown@google.com> 1317856327 -0700

Make SENSOR orientation modes trump rotation lock.
Bug: 5371750

Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2