tree c12379c1fe8e0c17f1f68c0647f544dad372c783
parent 58d8b956e7d83bb1b219405be87e135c89b9cdb2
parent 751d4ed43e8118f145edf18db4d987daf7dabbae
author Brian Carlstrom <bdc@google.com> 1374258287 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374258287 -0700

am 751d4ed4: Fixing cpplint legal/copyright issues

* commit '751d4ed43e8118f145edf18db4d987daf7dabbae':
  Fixing cpplint legal/copyright issues