tree b11c1712997eaeebaedebc64462e10b254e7e6d5
parent b86e85600de1a6eac23c4ccd64319a8477c4bb7b
parent e86de4c0670550a29edae77ebb9f5c8ba5631231
author John Spurlock <jspurlock@google.com> 1398822789 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398822789 +0000

Merge "Zen mode tweaks."