tree be548812f2e429ca1de8acec56f6261e042e3a10
parent 757fe8f2599ee3a75bf3642e22153dfb647ee36d
parent 40f95e77f3bcfa4e2af819d90e488bad910d27cc
author Daniel Xie <dxie@google.com> 1444188027 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444188027 +0000

am 40f95e77: am 17766476: am c010d91f: (-s ours) am 714738ed: am 3517c46b: am 76b836f7: (-s ours) Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev

* commit '40f95e77f3bcfa4e2af819d90e488bad910d27cc':
  DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures