| commit | 9232e2bda19146dad188055cd0050a93bfe8105c | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Dec 08 19:18:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:18:03 2014 +0000 |
| tree | a0a3f6e0ceb35a11bb5aeca5384b495b07b79820 | |
| parent | eeac6a99933c3fdac5584cb055b44c7f3e1e36f5 [diff] | |
| parent | b4198f29e1dd97a26f505499dc7054f36d90c2e1 [diff] |
am b4198f29: am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev * commit 'b4198f29e1dd97a26f505499dc7054f36d90c2e1': DO NOT MERGE: media: CTS workarounds for framework bugs