| commit | f162f4b5d952208e4b6e0a7b2e1bf01058e429b4 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Jan 20 16:37:16 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 16:37:16 2017 +0000 |
| tree | 527253d2f5fd962101b683f9cc0bf4f80fac39ae | |
| parent | 9be1df68033fb6994576c76e6843c539d82b3a0a [diff] | |
| parent | 333c5e0ea34930a10785f53e74dbe997d93ad2d8 [diff] |
Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr305-hostdex" am: 092d0433b4 am: a2c7129dbb am: 546f6ae5f1 am: 333c5e0ea3 Change-Id: Ib0cbc51078f4432ec4305f8dc38f36115c529984
diff --git a/.gitignore b/.gitignore index ba077a4..4471aab 100644 --- a/.gitignore +++ b/.gitignore
@@ -1 +1,2 @@ bin +*.iml