tree 12fa313bd4cf7ade3c70246e82c6ca21f72ed993
parent 2765d57153ff5cc7758c6ab958eb17449fcd2190
parent 9fd390c6b998eea2795a20ef0ff9f88018e03a4f
author Jorim Jaggi <jjaggi@google.com> 1437842878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437842878 +0000

am 9fd390c6: am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display

* commit '9fd390c6b998eea2795a20ef0ff9f88018e03a4f':
  Fix ambient display