tree ecf3a9e717071d723e37f00b852190834a43c325
parent 7252842e26e19789d0cbd2576f8076ca96e5980b
parent 61871926e68cadc1e98b1fac88dc6cfc63cf916c
author Jeff Brown <jeffbrown@google.com> 1314651871 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314651871 -0700

Merge "Add a "show touches" option for demos and presentations. Bug: 4569045"