diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-17 20:49:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-17 20:49:33 +0000 |
| commit | 42bc16cc7c46155c566936d14c506d974641d289 (patch) | |
| tree | 73641e04ccdd42ade1516136278d117b23d04bab | |
| parent | 2f757c8f92115f35dd220f836706805313df349b (diff) | |
| parent | 666ca6e20e7725dabf967abdea4bb610ab0c72ee (diff) | |
| download | sdk-42bc16cc7c46155c566936d14c506d974641d289.tar.gz | |
Merge cherrypicks of [2550323, 2550336] into oc-release
Change-Id: I798c16a354a33f39c5f98ef4637d9bc1072bda77
| -rw-r--r-- | sdk-annotations/README.txt | 2 | ||||
| -rw-r--r-- | sdk-annotations/annotations.zip | bin | 1159737 -> 135885 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/sdk-annotations/README.txt b/sdk-annotations/README.txt index c4342b601..b92648196 100644 --- a/sdk-annotations/README.txt +++ b/sdk-annotations/README.txt @@ -1,5 +1,5 @@ Generated from tools/adt/idea CL -234839667c6912ff7eaccd9102525d0ba495c886 +Id8df826530d9a201987de9701dba53307c5d5c6f (by building the Android Studio tree by running ./build_studio.sh in tools/idea, then copying the resulting androidAnnotations.jar diff --git a/sdk-annotations/annotations.zip b/sdk-annotations/annotations.zip Binary files differindex 468227cd8..fcd86d75d 100644 --- a/sdk-annotations/annotations.zip +++ b/sdk-annotations/annotations.zip |