tree 611d6c8ebe3a746d427c76f07fda909fed608641
parent bd408e234ed54a89b5c12db54aa204d845f6218d
parent bfde0261ca17ef8ff10804ab4120df43b392d5fe
author Deepanshu Gupta <deepanshu@google.com> 1412257667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412257667 +0000

am bfde0261: (-s ours) am 5a939b42: am 16df192a: am 4d19dc0e: am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev

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