OSDN Git Service

am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for intege...
authorLajos Molnar <lajos@google.com>
Mon, 24 Nov 2014 18:12:56 +0000 (18:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Nov 2014 18:12:56 +0000 (18:12 +0000)
commit7d612f0deba16ccd2c30be302db0c19913b9a7f4
tree8ed8a87896b86219db79ac09d25f02e2f369e2d8
parenta48e26bb656f1f33fba8a6373bc42e0fd5228cf6
parent0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb
am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev

* commit '0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb':
  media: fix isSupportedFormat for integer frame rate
media/java/android/media/MediaCodecInfo.java