OSDN Git Service

am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 17 Aug 2012 00:37:43 +0000 (17:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 00:37:43 +0000 (17:37 -0700)
commitf20e4ad9f23fe0267f8f3434a6eb961eb69bde3a
tree6cf3483ce068f19f190104917737da2bc6228653
parent0df213babc4fb41b7daa05cb3c08071f2b60f6a5
parentc1d2777c8004a9491e1381cca33a6768faed50c3
am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"

* commit 'c1d2777c8004a9491e1381cca33a6768faed50c3':
  stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h