tree 9413beae72e341f05cfecff4658f648a47b9fea8
parent 17ce8846ca97754579442f80d3e19e2d5aa7597f
parent a0e1c3918dd1356445df98e89dab6be2c8a78da3
author Andy McFadden <fadden@android.com> 1386798524 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386798524 -0800

am a0e1c391: Merge changes Ia684fde5,I58fcb526

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