tree ff5929ffbdcd192189650b6a0d9999d7eac6b967
parent 3cdef6b94a80122511555f8f08001e904b4b1a9c
parent ddaf581d53fa040fffa3f27e323d08220b11acc6
author Daniel Xie <dxie@google.com> 1442337783 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442337783 +0000

am ddaf581d: am 58a9b148: am 061f7ae8: am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev

* commit 'ddaf581d53fa040fffa3f27e323d08220b11acc6':