OSDN Git Service

am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into...
authorRonghua Wu <ronghuawu@google.com>
Tue, 12 May 2015 22:14:29 +0000 (22:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 May 2015 22:14:29 +0000 (22:14 +0000)
* commit '69e927c3cd8398e484849f7639fd781e106c1045':
  media: merge CodecException's getErrorCode and getReason.


Trivial merge