tree c3f7b8c8a68a0c3c877fc83d1a5a68955e374a72
parent d97c3fa75f7f212691ed6718f32ca25c2416a74d
parent 85f84643e8bc023d665249e409e614cb3a4b7444
author John Spurlock <jspurlock@google.com> 1410906031 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410906031 +0000

am 17aa1d45: am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev

* commit '17aa1d45a88b14fe6f0283f79c2602d3243335ae':
  Zen: Fix recent regression in mode selection after reboot.