tree c66092b5867c81e2fa422a1fd72cab971a65dbf4
parent ae86e83888bf178b909ae27e3110bc958906ba7e
parent 52ff7c18102c06b60a2f80de5f92be072f4ec936
author Tor Norbye <tnorbye@google.com> 1428384839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428384839 +0000

am 52ff7c18: am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f

* commit '52ff7c18102c06b60a2f80de5f92be072f4ec936':
  Track tools/base API change in Eclipse plugin