am 5ff2f2fe: am c6ed4922: Add NOTICE and MODULE_LICENSE files
authorConley Owens <cco3@android.com>
Wed, 18 Mar 2015 23:49:51 +0000 (23:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Mar 2015 23:49:51 +0000 (23:49 +0000)
* commit '5ff2f2fe53143eeda302c55100d72d2fcfead8f7':
  Add NOTICE and MODULE_LICENSE files


Trivial merge