tree de0c83367a1497bde301494162e982888492430d
parent 58477dabb6138bf4928033f18b6a81c940293b49
parent a70dc75c177980079f7e94d676faa32aa06b6493
author Ian Lake <ilake@google.com> 1430876181 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430876181 +0000

am a70dc75c: Merge "Include all actions in PlaybackStateCompat setActions/getActions() documentation" into lmp-mr1-ub-dev

* commit 'a70dc75c177980079f7e94d676faa32aa06b6493':
  Include all actions in PlaybackStateCompat setActions/getActions() documentation