OSDN Git Service

Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
authorLajos Molnar <lajos@google.com>
Wed, 1 Jun 2016 23:44:12 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 23:44:12 +0000 (23:44 +0000)
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b


Trivial merge