tree 5723fe57d49094194791e80ea028565955d2025c
parent d5f641a620e7f6f253bf7fd8a56cb876857712ea
parent a9d563f307c71f91026e9464662434e6feb06ec2
author Andy McFadden <fadden@android.com> 1386803080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386803080 +0000

am a9d563f3: am 7c464c07: am a0e1c391: Merge changes Ia684fde5,I58fcb526

* commit 'a9d563f307c71f91026e9464662434e6feb06ec2':
  Fix the help text
  screenrecord fixes