tree 369285405498126a5172a23581dc5d590b61fa45
parent 8f1dd6fdc2f788492e5ca77344eac13755c304ff
parent bd961f4c4d51c4fcfc4722d02383eb4263ef0ac5
author James Dong <jdong@google.com> 1339536177 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339536177 -0700

am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev

* commit 'bd961f4c4d51c4fcfc4722d02383eb4263ef0ac5':
  Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor