tree 8a5d97c9e3e4eaeb020afb38b7742ba5ea5da082
parent 41a31123a0fc59b8112460285d3f1ba73c5537c0
parent 6b035cd4c491166451987164fe6f18782ab0ae62
author James Dong <jdong@google.com> 1328911925 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1328911925 -0800

Merge "Do not use macros from MediaDebug"