tree 4f1ee647435a82a5908ca02c9780bf108bf012a5
parent 39382aa77a6c50eb4b7292c1d5063a2934c3f36c
parent 4dfce20cac7492882d366d053006795aefad59da
author Jeff Brown <jeffbrown@google.com> 1317860669 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317860669 -0700

Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"