OSDN Git Service

am 32f212ea: (-s ours) am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT...
authorLajos Molnar <lajos@google.com>
Tue, 24 Jun 2014 19:42:44 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jun 2014 19:42:44 +0000 (19:42 +0000)
commit18ecefebded5be766a000a8d8e8d578b7b846065
treec1009748a8288b9b418b9597f0be853dd1f01c2a
parent840797f674f7c38d5215d0bcf0f4547c4e9a6957
parent32f212ead657617df00c948448680b7ff7d11146
am 32f212ea: (-s ours) am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"

* commit '32f212ead657617df00c948448680b7ff7d11146':
  DO NOT MERGE: Fix for SW video decoder OMX profile/level query