OSDN Git Service

am 7a8c38b1: am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and...
authorRonghua Wu <ronghuawu@google.com>
Fri, 8 May 2015 23:15:12 +0000 (23:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 May 2015 23:15:12 +0000 (23:15 +0000)
commitb60966e2c5459ff5fd18edf578e9e371a0d134db
treed38dab24028b9d4bbc5971d73ec542ade1b356fd
parentf1e2acc5a1d96b36ad99ee42adef752a38c57fc0
parent7a8c38b168207d7c4e893548c9f6f0054a3d98ac
am 7a8c38b1: am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev

* commit '7a8c38b168207d7c4e893548c9f6f0054a3d98ac':
  media: merge CodecException's getErrorCode and getReason.