| commit | 018b4e4aa14dc2b82f7211251b402d6661191247 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Sep 03 22:04:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 22:04:27 2015 +0000 |
| tree | 2cec1ecd3f6cccdc947270fad15e0059b9820c68 | |
| parent | 333ee4961d52580f6f7fc44db18f0b93845fe41d [diff] | |
| parent | baf4543e8950c4430647ef65f62274eba121dd13 [diff] |
am baf4543e: (-s ours) Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev * commit 'baf4543e8950c4430647ef65f62274eba121dd13': DO NOT MERGE: media: CTS workarounds for framework bugs