tree f012006b3eac20607e853f6345bb95a0ed8f201e
parent d4577c0c29f8e38a34d1aeac59803b37769af790
parent 6e3bceef9c0fcc82881fd88e98b299ce0371bbfa
author James Dong <jdong@google.com> 1332608226 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332608226 -0700

Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted."