tree d359abd51fcaf4f94cab2a03cc20e3c08fe2a0fd
parent 4371922d13794726d5fb6917b6db07c13e6d7ae2
parent fa37ee81ed80f0dc6eeeed2d9a89610dd967229a
author Alan Viverette <alanv@google.com> 1438204319 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438204319 +0000

am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev

* commit 'fa37ee81ed80f0dc6eeeed2d9a89610dd967229a':
  DO NOT MERGE: Don't backup night mode setting