tree 9b77f894e58b52aa53131330482291c198d55989
parent b3acbc3195a5c960b4a63cd6855caf4356fc4fe0
parent 04a4d9ade8c3ac18476c0f5a934e4efc6365fee8
author Ying Wang <wangying@google.com> 1295462102 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295462102 -0800

am 04a4d9ad: am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.

* commit '04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
  Move videoeditor libraries to generic_no_telephony.mk.