tree f684a87ce20867744cedba606a67201746d39a56
parent c7375b1c1568c890075885ddd6c4aafc87b3aea3
parent 6ce27b22ddccf11c3d26fa98d2cb4ab1e4dbe748
author Sungsoo Lim <sungsoo@google.com> 1433270707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433270707 +0000

am 6ce27b22: am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit '6ce27b22ddccf11c3d26fa98d2cb4ab1e4dbe748':
  Add CTS for MediaController.TransportControls and its callback