| commit | ea3bf6572c936d26a534dde5ce3ee7dc3bedaf31 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Aug 27 05:21:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:21:34 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | a4ece83c2d52fce6701eb4d8f4d101f67492260c [diff] | |
| parent | 1e07d89c4ab0d237bb6c1e8b18c75360f936ce7e [diff] |
am 1e07d89c: (-s ours) am a45ccfb8: am b9b2eee2: (-s ours) am f311db04: am 2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev * commit '1e07d89c4ab0d237bb6c1e8b18c75360f936ce7e':