tree 66625646e1e4b09c1277b53eeee5ecbc821de076
parent 3d8f41913c43b3c82b20aef1572fc5a0f7126589
parent 5ac22aa60f773917981f42e64fbc28615871fd3e
author Mike Lockwood <lockwood@google.com> 1422299444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422299444 +0000

am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev

* commit '5ac22aa60f773917981f42e64fbc28615871fd3e':
  MTP: Fix partial implementation of 5 new audio specific properties