OSDN Git Service

am 00157c0d: am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to the AAC...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 29 Jul 2013 23:40:21 +0000 (16:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Jul 2013 23:40:21 +0000 (16:40 -0700)
* commit '00157c0d466786e7f125f58257ff706e132c52ef':
  MediaFormat: Fix the documentation link to the AAC profile constants


Trivial merge