| commit | 58477dabb6138bf4928033f18b6a81c940293b49 | [log] [tgz] |
|---|---|---|
| author | Ian Lake <ilake@google.com> | Wed May 06 01:36:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 01:36:19 2015 +0000 |
| tree | 2f3a8ec8a48e43eb3f78189a3f8a325bc645dfde | |
| parent | c89a68ed243c7808e44d83a1a56f1e2642ba231b [diff] | |
| parent | 928aa59e29b056bf4ccf3ca80e121a3d1251a843 [diff] |
am 928aa59e: Merge "PlaybackStateCompat: Add support for custom actions, extras, and active item id" into lmp-mr1-ub-dev * commit '928aa59e29b056bf4ccf3ca80e121a3d1251a843': PlaybackStateCompat: Add support for custom actions, extras, and active item id