tree c66092b5867c81e2fa422a1fd72cab971a65dbf4
parent 877d3a06a4675b43b4a27abec7b44877742b5124
parent 20d9be71b4b7305f643442942a6faa5df25bfc11
author Tor Norbye <tnorbye@google.com> 1428384253 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428384253 +0000

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

* commit '20d9be71b4b7305f643442942a6faa5df25bfc11':
  Track tools/base API change in Eclipse plugin