| commit | b462c6ed314fbf3f80e6c63b1d8853365033563a | [log] [tgz] |
|---|---|---|
| author | Stephan Herhut <herhut@google.com> | Tue May 23 07:28:50 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 23 07:28:50 2017 +0000 |
| tree | 1d32b7f8b54173a5543511c2f7126888dc68e7c0 | |
| parent | f8261421cddad253e79c15e3c2a226103654f55a [diff] | |
| parent | ef3d5a5e05ab622a6fe044d1431da8140d9b049c [diff] |
Merge "Move class merger behind a flag."
diff --git a/.gitignore b/.gitignore index 8f75e04..2ece82e3 100644 --- a/.gitignore +++ b/.gitignore
@@ -50,6 +50,8 @@ third_party/youtube/youtube.android_11.47.tar.gz third_party/youtube/youtube.android_12.10 third_party/youtube/youtube.android_12.10.tar.gz +third_party/youtube/youtube.android_12.17/ +third_party/youtube/youtube.android_12.17.tar.gz third_party/jctf third_party/jctf.tar.gz third_party/android_cts_baseline