diff options
author | Tor Norbye <tnorbye@google.com> | 2015-04-07 05:14:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 05:14:55 +0000 |
commit | 20d9be71b4b7305f643442942a6faa5df25bfc11 (patch) | |
tree | c66092b5867c81e2fa422a1fd72cab971a65dbf4 /annotations/src/android | |
parent | 09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a (diff) | |
parent | ac1d4eda49dce252da1fa3f7f02b94acfa0f1c45 (diff) | |
download | sdk-20d9be71b4b7305f643442942a6faa5df25bfc11.zip sdk-20d9be71b4b7305f643442942a6faa5df25bfc11.tar.gz sdk-20d9be71b4b7305f643442942a6faa5df25bfc11.tar.bz2 |
am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f
* commit 'ac1d4eda49dce252da1fa3f7f02b94acfa0f1c45':
Track tools/base API change in Eclipse plugin
Diffstat (limited to 'annotations/src/android')
0 files changed, 0 insertions, 0 deletions