| commit | 2b51d7ecbc50133d03c7cf227eb4bbe256408605 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Oct 13 05:21:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 05:21:24 2015 +0000 |
| tree | 224dfec772619081e01916ff8c07d763474a6bf4 | |
| parent | 71a17c88ff929a79f67384602ab94e4e210dae71 [diff] | |
| parent | 9f4dea9f783d9d7d0334aee79dfb407c6f942045 [diff] |
am 9f4dea9f: (-s ours) am 0b3a585f: am 036b6593: am 5076a51e: am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev * commit '9f4dea9f783d9d7d0334aee79dfb407c6f942045': DO NOT MERGE - audio policy: validate stream type received from binder calls.