OSDN Git Service

am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 13 Feb 2015 22:38:07 +0000 (22:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 22:38:07 +0000 (22:38 +0000)
commit4e47416012b8cb88d564a04a29c0b79a28b9e529
treed56d4296bdfce4743e88715d4692efc601561885
parentfe2c687b97f21b7dd5471279c1b2b9458dcd22bf
parent12c9e4980e889d1c72656a4062f9cee9a0e6f15a
am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev

* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
  Changes made by intelliJ 14.1