OSDN Git Service

am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerg...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 17 Feb 2015 22:24:20 +0000 (22:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Feb 2015 22:24:20 +0000 (22:24 +0000)
commit88542b8a6bc7af70013e537615acc1cc636234b8
tree099917557c32867e03d870d73bbbf05bb6983d0f
parentd7a4f645e76961a5516b48c457729e1edef090f5
parent221d732005b04b5f979d2e03e8ebe00160e52ca3
am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416

* commit '221d732005b04b5f979d2e03e8ebe00160e52ca3':
  Changes made by intelliJ 14.1