tree 6c9116cbfcafdc9a55872bd2d0206ddb3d7317d7
parent 74507dae70a4779b57bd4153da96c2e04381eae6
parent 421e20aaf299384abe73c79113e75620064a2c95
author Conley Owens <cco3@android.com> 1414364222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414364222 +0000

am 421e20aa: am bbe96fe0: am a74b2e16: Merge "Add MODULE_LICENSE and NOTICE files"

* commit '421e20aaf299384abe73c79113e75620064a2c95':