tree 4af660acb1f3bfc9054913ee53c86378a0a420c9
parent 5274d3c2eca046fc85f39cccc385750e5178693d
parent 8dad3254040d8ae78bdac5286ed122af3299d85e
author Daniel Xie <dxie@google.com> 1442956554 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442956554 +0000

am 8dad3254: am 8ecef436: am 693c418d: am c16428d4: am 6a7a8979: am 7be08fbd: am ce5e6ca9: am a403e7b6: am e72c11ad: am 1044110e: am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898

* commit '8dad3254040d8ae78bdac5286ed122af3299d85e':