commit | b4198f29e1dd97a26f505499dc7054f36d90c2e1 | [log] [tgz] |
---|---|---|
author | Lajos Molnar <lajos@google.com> | Fri Dec 05 21:26:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 21:26:18 2014 +0000 |
tree | 1e2e6a0d752049aedf4c61354294e10d0da2a53f | |
parent | e20d5dac492e5da51e91f96babd1c9ed1aa537df [diff] | |
parent | baf4543e8950c4430647ef65f62274eba121dd13 [diff] |
am baf4543e: 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