tree baebddb5d6824ad36e966f36c244b0a75b70bce4
parent 75f2f993392a3903d160e7fed81c0b7ff5cf76f1
parent 735229c5a8286f1ecff5cf54d9ce2c06d7f97d51
author Deepanshu Gupta <deepanshu@google.com> 1412239858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412239858 +0000

am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev

* commit '735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
  Update intelliJ copyright profile [DO NOT MERGE]