tree 72e708ec7418fce9aaab77501a4cc9be82766f15
parent 721a4020a7dfcb2a5f7cfc72d5b5b73af0bd9474
parent e8914cec61ba38c7e2c534ebaf7e3d47daa40a57
author James Dong <jdong@google.com> 1286231740 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286231740 -0700

Merge "Resilent media time stamp adjustment" into gingerbread