tree d8bbb1b8a1431846f7adc665d88cbe5f6dd4c654
parent 8fe9840be2ce6aac8a008fc15cb641f858b5a32e
parent e20435de10f63af812da9d4f801b61a8817733a0
author James Dong <jdong@google.com> 1339645893 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339645893 -0700

am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev

* commit 'e20435de10f63af812da9d4f801b61a8817733a0':
  Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/