tree 00af7102a74862c1d1d420aab7fe614cb4862a6a
parent eb034a75e79556e0fe8b25453b422b2901a3b853
parent 58a2c552e4b18257f993cfd52627003dfb0b2bda
author Tor Norbye <tnorbye@google.com> 1428382366 +0000
committer android-build-merger <android-build-merger@google.com> 1428382366 +0000

Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev
automerge: 58a2c55

* commit '58a2c552e4b18257f993cfd52627003dfb0b2bda':
  Track tools/base API change in Eclipse plugin