tree 613e172fcb2b838eba7c503c125ca6d25dedfaf9
parent ec57c3d04df972c55e66ea8bfa791f2c12aca7e3
parent bb78b40d83b790a0e08d5587160a5138520bc402
author Alex Ruiz <alruiz@google.com> 1404252034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404252034 +0000

am bb78b40d: am 35059e90: Merge "Now we check at startup that the IDE does not have an old copy of builder-model jar file." into idea133 automerge: 42d9e12

* commit 'bb78b40d83b790a0e08d5587160a5138520bc402':
  Now we check at startup that the IDE does not have an old copy of builder-model jar file.