tree 1d4d8ef9af568f483caafddf7ab65a1925bffe6d
parent 7481a58d6a280e616aba8dc79bbc2fe312e7e4b5
parent 4cb90b7e64db457698b33a852dd16b0cae2e69ed
author Jianhong Jiang <jianhong@google.com> 1257375829 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257375829 -0800

am 4cb90b7e: (-s ours) DO NOT MERGE TO MR2 RIO-7939: Change H.263 encoding default GOB header interval to 0 Cherry-picked from MR2

Merge commit '4cb90b7e64db457698b33a852dd16b0cae2e69ed' into eclair-mr2

* commit '4cb90b7e64db457698b33a852dd16b0cae2e69ed':
  DO NOT MERGE TO MR2