aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2 am: 0d446c0a6fandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r2android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-o-mr1-preview-2android-o-mr1-preview-1android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devPaul Duffin
am: c2e228b07b Change-Id: I737b987a8b22811c7ea058bcd9898b58694b58ce
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2Paul Duffin
am: 0d446c0a6f Change-Id: I91bce7a26df4532d6926910885171249e6336a5f
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Paul Duffin
am: f324aac9e2 Change-Id: I12d85f17def51bf7047dd664b941ea1cdb2bfc92
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'android-o-preview-1android-n-mr2-preview-2o-previewPaul Duffin
* changes: Temporarily add void is(Class) to cause compile time errors Make it compile in error prone Replace org.hamcrest.Factory for backwards compatibility Remove org.hamcrest.beans and update Matchers Upgrade to almost 2.0.0.0
2017-02-22Temporarily add void is(Class) to cause compile time errorsPaul Duffin
The is(Class) method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the is(Object) method instead. Although not every existing usage would compile successfully it is possible that some could and that would result in a change in the runtime behavior that could be difficult to detect and fix. This change aims to turn any significant usage of this method into a compile time error. Bug: 30946317 Test: make checkbuild Change-Id: I48d1c80fb9faae4e4c490f30c9fe0275fd66a58b
2017-02-22Make it compile in error pronePaul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: If762c67adc8ffd0db9d7ea4dd0e41c5fdb0197f2
2017-02-09Replace org.hamcrest.Factory for backwards compatibilityPaul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: I47a2c30f820a35ceabdcdb3f972b36fd843f7d76
2017-02-09Remove org.hamcrest.beans and update MatchersPaul Duffin
This package relies on java.beans. which is not supported on Android. Bug: 30946317 Test: make checkbuild Change-Id: I87564d796292207de796c34760ec7e33e2aca3c3
2017-02-09Upgrade to almost 2.0.0.0Paul Duffin
See the README.android for the exact version used and an explanation as to why it was chosen. Bug: 30946317 Test: make checkbuild Change-Id: Icae106f5e4a62d2a34f4cf03506fd63676814c07
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 am: e6442f2604 am: a7b13a9be8 Change-Id: I4e29972dddb17dd667623ba1d9383c80f8b90fc8
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 am: e6442f2604 Change-Id: Ice7c16b51eda7dfd8dfed60f1476cdf13286668c
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 Change-Id: Id38f78144dc2ae1d0192942de2ae2ff4b6869ae8
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors"Paul Duffin
am: 21a7b5b68f Change-Id: Iacfe2b469fac261f8fea4af5e687cce554e64826
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors"Paul Duffin
2017-02-06Temporarily add void is(Class) to cause compile time errorsPaul Duffin
The is(Class) method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the is(Object) method instead. Although not every existing usage would compile successfully it is possible that some could and that would result in a change in the runtime behavior that could be difficult to detect and fix. This change aims to turn any significant usage of this method into a compile time error. Bug: 30946317 Test: make checkbuild Change-Id: Ib0fac6e944b94ba8f1b5434d64549cc12f20d938
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3 am: ↵Paul Duffin
11a97a2ff7 am: 1dfb5bbe24 Change-Id: Ib4f853674ae97e7d7b4e3cef05e2668ef514e045
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3Paul Duffin
am: 11a97a2ff7 Change-Id: Ic6f19947a26f73d271baade0e05a356d191b8b09
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989Paul Duffin
am: b5937e4be3 Change-Id: If80fc516cf4d452c8f847a578687b32f0cf87a2e
2017-01-24Merge "Match upstream file structure"Paul Duffin
am: 5d9cc8c989 Change-Id: I3b544565dfe8750cda1b1b10c2231dda02f54470
2017-01-24Merge "Match upstream file structure"Treehugger Robot
2017-01-20Match upstream file structurePaul Duffin
Bug: 30946317 Test: make checkbuild and run cts CtsTextTestCases Change-Id: I6c1773018f95855eb6599d66f6fb5923c7d48b03
2016-12-15Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6f am: 43a62f7d24Paul Duffin
am: 5f28c864e2 Change-Id: Ief544f8a11b0909718a6835ca7fe16328cf42ded
2016-12-15Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6fPaul Duffin
am: 43a62f7d24 Change-Id: Ic5fb12f67a5dd7eba52b853d3516fbf41b5e54af
2016-12-15Merge "Remove hamcrest-integration" am: f1015b50e7Paul Duffin
am: 013fc08d6f Change-Id: Ia03060046a3bd4e39947c37afa96e9642605ce23
2016-12-15Merge "Remove hamcrest-integration"Paul Duffin
am: f1015b50e7 Change-Id: I3385ea2635f4a07148585686cd97647efe8a1907
2016-12-15Merge "Remove hamcrest-integration"android-n-mr2-preview-1Paul Duffin
2016-12-14Remove hamcrest-integrationPaul Duffin
This target is not used and the module does not exist in Hamcrest 2.0. In Hamcrest 2.0 the file it contains has been merged into the hamcrest-core module, which is represented in Android by the hamcrest/hamcrest-host/hamcrest-hostdex build targets. Similarly, in Hamcrest 2.0 the TypeSafeMatcher class is in the hamcrest-core module and not the hamcrest-library module. This moves the two classes into the appropriate module in preparation for upgrading JUnit to 4.12 and Hamcrest to 2.0. Bug: 33613916 Bug: 30946317 Test: make checkbuild Change-Id: Ib22cf3dce1180b3df12764093b727ff2482c51e5
2016-12-09Merge "Use SDK 25 to match the junit target" am: 9a60bf3100 am: 8fd99c2f7f ↵Paul Duffin
am: 5cd6f2067c am: c85b00aa34 Change-Id: I90b1d5f85e5af5892d2360e938e1dbd681a2fc2a
2016-12-09Merge "Use SDK 25 to match the junit target" am: 9a60bf3100 am: 8fd99c2f7fPaul Duffin
am: 5cd6f2067c Change-Id: Ic9c12866c5f8aa86537278ae2de87f0794504247
2016-12-09Merge "Use SDK 25 to match the junit target" am: 9a60bf3100Paul Duffin
am: 8fd99c2f7f Change-Id: I9fd6307d3d629c4ec644f93642bab999973df55e
2016-12-09Merge "Use SDK 25 to match the junit target"Paul Duffin
am: 9a60bf3100 Change-Id: Ic9c1343a902b0952559d90a4c5f8558d73ce8f15
2016-12-09Merge "Use SDK 25 to match the junit target"Paul Duffin
2016-12-09Use SDK 25 to match the junit targetPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: Iaf29345eb1012030c158c6e0a847fffa6ea6c513
2016-05-03Merge "Extra generic type information to aid certain javacs." am: 9a62c01586 ↵Ian Rogers
am: 0a780cb8b9 am: a80259979f am: dcfef4a7d4 * commit 'dcfef4a7d4c1b4dccffd071819862732aaf8d1f7': Extra generic type information to aid certain javacs. Change-Id: I5eadc259b40744e0bfb4bb76c065bd1b75f2441c
2016-05-03Merge "Extra generic type information to aid certain javacs." am: 9a62c01586 ↵Ian Rogers
am: 0a780cb8b9 am: a80259979f * commit 'a80259979f535e973382fa9a41bc2fda0a4553b7': Extra generic type information to aid certain javacs. Change-Id: I6ff0d60671fc77ef2cdaa1d89941fbeebfbbbbdc
2016-05-03Merge "Extra generic type information to aid certain javacs." am: 9a62c01586android-n-mr1-preview-2android-n-mr1-preview-1Ian Rogers
am: 0a780cb8b9 * commit '0a780cb8b9de02975a556837a88de6ad1b9b19a0': Extra generic type information to aid certain javacs. Change-Id: I088d7743f128e61fae7c0f7291a455b7146cd712
2016-05-03Merge "Extra generic type information to aid certain javacs."Ian Rogers
am: 9a62c01586 * commit '9a62c015862adfec113c5a2dc786d835e50230af': Extra generic type information to aid certain javacs. Change-Id: Ie0d0c8a3f3b42bae5b54d750207f8aa150d8d986
2016-05-03Merge "Extra generic type information to aid certain javacs."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Ian Rogers
2016-04-29Extra generic type information to aid certain javacs.Ian Rogers
In particular this is needed for the code to compile using the error prone analyzer. Bug: 27723540 Change-Id: Ibfcef50dec0291f51a4372e18da40e859ac3e2e1
2015-08-27am df3b4534: (-s ours) am c2c94b1a: Merge "Revert "Delete obsolete ↵android-n-preview-2android-n-preview-1android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1afw-test-harness-2.1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseKenny Root
hamcrest-hostdex rule."" * commit 'df3b453429c1bbb9d9524c471989287d10cf2f40':
2015-07-24am c2c94b1a: Merge "Revert "Delete obsolete hamcrest-hostdex rule.""Kenny Root
* commit 'c2c94b1ab146e8f991352d1eb8c6188ffd0593ee': Revert "Delete obsolete hamcrest-hostdex rule."
2015-07-24am c2c94b1a: Merge "Revert "Delete obsolete hamcrest-hostdex rule.""Kenny Root
* commit 'c2c94b1ab146e8f991352d1eb8c6188ffd0593ee': Revert "Delete obsolete hamcrest-hostdex rule."
2015-07-24Merge "Revert "Delete obsolete hamcrest-hostdex rule.""android-m-preview-2Kenny Root
2015-07-24Revert "Delete obsolete hamcrest-hostdex rule."Kenny Root
junit4-target-hostdex uses it now. This reverts commit 27f8453eb7f13c43356a3de1ee045ce5ecaa9ff6. Change-Id: Ib0c7d8d3feb37532dad2b4aefa460be64e3a6edd
2015-07-14Revert "Add a configuration to hamcrest-library build.gradle"android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devandroid-live-tvJie Dai
This reverts commit 87e430c688618f0e112641a83c7b2f8a8c24f16e. Change-Id: Iadbce0bbf79216a3b844bc78213936c6f0b76a38
2015-07-07Add a configuration to hamcrest-library build.gradleJie Dai
Change-Id: I12dc1bc590455ad813f16ffc831817346a4979e9
2015-01-23am 8567823d: Merge "Delete obsolete hamcrest-hostdex rule."android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1afw-test-harness-1.5marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseNarayan Kamath
* commit '8567823d024f160a2371bc89b822889aab0a7214': Delete obsolete hamcrest-hostdex rule.
2015-01-23Merge "Delete obsolete hamcrest-hostdex rule."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-1android-m-previewNarayan Kamath
2015-01-23Delete obsolete hamcrest-hostdex rule.Narayan Kamath
Nobody uses it. Change-Id: Ida772751f2a44b101dce1c935277735ca16054dd
2014-10-10am 15e01a79: Add gradle build to hamcrest.Jon Boekenoogen
* commit '15e01a79e1b28255229f4d3aefc4b030c261afd1': Add gradle build to hamcrest.