tree a1a550cc36865cb8d5601cb74d6e7a59fe50096e
parent 5461ecdd12925d8ad59a40c34c157a731a1cd1f9
parent acb3b610e1d571a93e920148fe0c722cf72b821b
author Jean-Baptiste Queru <jbq@google.com> 1360991253 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360991253 -0800

am acb3b610: Re-format for uniformity with other licenses

* commit 'acb3b610e1d571a93e920148fe0c722cf72b821b':
  Re-format for uniformity with other licenses