tree 785d31ad53abea17951fa8578492f3ef8e40090a
parent b45d3926f327948c486c92ddc7fdb97dbc98e401
parent c077ee316e0f6f50ade552f51ae657a08e423eaa
author Yang Ni <yangni@google.com> 1426801319 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426801319 +0000

am c077ee31: Merge "Added copyright notice and formatted to convention"

* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention