tree dafe0b45d404cac544f0822619ccc73805739a6c
parent 230c9ed9836dfb4b417615bef8bfbe23e768ecba
parent 590fa76b03261f88b6fa9b461d3bc824f8843164
author Robert Shih <robertshih@google.com> 1442443864 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442443864 +0000

am 590fa76b: (-s ours) am 2ced4bfc: am 05d0eea3: am 90f66ced: am 5f4469e5: am b0fedae0: (-s ours) am b0fe4ab6: am 1828e78f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into klp-dev

* commit '590fa76b03261f88b6fa9b461d3bc824f8843164':
  DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls