tree 41cb42b8bd8be0d6c8368c77982786307cba7070
parent 83977eb230d829cfe520f55d7977037a904ce548
parent 872a481558350634a3fd5cb67939de288af00ecb
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