tree 02fd2dd6b8639136a197b887fd8b9759e5f03ded
parent 913a8925c07e854a80bf5df87561f290d3a56d61
parent 05e80b4c1c52a6dc1f305e26ce67162256d6bcc5
author James Dong <jdong@google.com> 1282841232 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282841232 -0700

Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread