tree fc85b68d4b5047404f3583a602d4b8ac7a13c9b3
parent 1d66c2997d27ffd6ec57479488a0f963fcbca4dd
parent e2841822257360cb230f905142503ce6a684005b
author Conley Owens <cco3@android.com> 1425595399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425595399 +0000

am e2841822: am d0538bb1: Merge "Add NOTICE file"

* commit 'e2841822257360cb230f905142503ce6a684005b':
  Add NOTICE file