tree 61b7ac04120fceef4bc49fd25e4cf3a3a31e78e9
parent 8067c9ec87906fb591bbc36d1c8aedb09160b2b4
parent cccae25fc7cd3daf68dee3d3ca7665a5ea12f097
author John Spurlock <jspurlock@google.com> 1391806902 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391806902 -0800

am cccae25f: Merge "Example controller app for system ui demo mode."

* commit 'cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
  Example controller app for system ui demo mode.