| commit | 32f212ead657617df00c948448680b7ff7d11146 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Jun 24 19:35:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 24 19:35:30 2014 +0000 |
| tree | 7a48c2c67e7c83055f26c0fe59584b3a52c44429 | |
| parent | 76e4e02d6b6c1da140b8cbe48fc58035d2b7d311 [diff] | |
| parent | 87c47b0d1c2df3e8630eb1b78fe303cfb24b3ad5 [diff] |
am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query" * commit '87c47b0d1c2df3e8630eb1b78fe303cfb24b3ad5': DO NOT MERGE: Fix for SW video decoder OMX profile/level query