summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-03release-request-ca4ad653-1655-436a-b65c-2527b02ae5f2-for-git_oc-mr1-release- ↵android-wear-8.1.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-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_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-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-releaseandroid-build-team Robot
4241196 snap-temp-L48200000088705722 Change-Id: I7cb557eafb72046e11acac49113681ede4a6701a
2017-08-02Update ddmlib with timeout fixes am: 2f2f81b6b5oreo-mr1-devjdesprez
am: 80a47e9db2 Change-Id: I7e98e60e56d94b28ecf05e3072747a86dcc7abcc
2017-08-02Update ddmlib with timeout fixesoreo-dr1-devjdesprez
am: 2f2f81b6b5 Change-Id: I3eac674d91bfac4bb49a6af42f7cf4cf35470ae6
2017-07-26Update ddmlib with timeout fixesjdesprez
Test: see over CL Bug: 63834732 Change-Id: I65815fb54e626434026e22c0d027c98c90d2b75f
2017-07-23release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release- ↵android-build-team Robot
4207446 snap-temp-L19600000085022555 Change-Id: I9959baba8339daecb7e68400cba4cb48fc2afa54
2017-07-21DO NOT MERGE: Cherrypick dependency fixes for espresso from master to oc-mr1-devSoroosh Mariooryad
master changes: ag/2573455, ag/2576567 Test: make SettingsGoogleUnitTests; runtest --path vendor/unbundled_google/packages/SettingsGoogle/tests/unit/src/com/google/android/settings/search/SearchRankingDataTest.java Change-Id: Ibdc6db412772ab646ac0fecc6b1e2fb9b997b744
2017-07-20Revert "Update ddmlib to get timeout command" am: 101cb219aeMichael Rosenfeld
am: 4eac4138a4 Change-Id: I2c9fcf2830f483693bb6320b774ecf90ba6365ed
2017-07-20release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release- ↵android-build-team Robot
4198291 snap-temp-L50900000084068812 Change-Id: I245a4df7f240cc3d7282fb937abba5c4c172996a
2017-07-20Revert "Update ddmlib to get timeout command"Michael Rosenfeld
am: 101cb219ae Change-Id: I65f666d0b55d3b2b5c857b4e4457365328963948
2017-07-19Revert "Update ddmlib to get timeout command"Michael Rosenfeld
This reverts commit 66cc81b7b110a42ce0ac8b8dcc56a57db6861295. Change-Id: I1abbd42f1e48202760031ed3da49da085401d975 BUG: 63702919 BUG: 63847006
2017-07-19Update android-support-test prebuilts.Brett Chabot
This commit updates prebuilt jars with runner/rules 1.0.0 and espresso 3.0 from atsl_6.0_alpha_2 prerelease. Also removed the jars with bundled dependencies and replaced with list of dependent libraries. Test: make tests Change-Id: Ia6b2334a761186d19867b3dc1a289cef9901bee0
2017-07-12release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release- ↵android-build-team Robot
4173087 snap-temp-L93200000081515229 Change-Id: Ibb00259643efee1b68fd2cd2567fd448ac20886f
2017-07-11Merge "Update relocation packer" am: 1ecf5205db am: f8e30c61e4 am: e7840e43abDimitry Ivanov
am: 95a7f223b2 Change-Id: Ia73999f54c5e0f917c359d3ad4445f971eee86e4
2017-07-11Merge "Update relocation packer" am: 1ecf5205db am: f8e30c61e4Dimitry Ivanov
am: e7840e43ab Change-Id: Ia517c93e46cbc9de4e007cc5067b8b82f8f41ae8
2017-07-11Merge "Update relocation packer" am: 1ecf5205dbDimitry Ivanov
am: f8e30c61e4 Change-Id: I59360907e136d3f7147ff0599172eb0f44ec57d6
2017-07-11Merge "Update relocation packer"Dimitry Ivanov
am: 1ecf5205db Change-Id: I7f948f61972476228a54f35c5503d2e593288b34
2017-07-11Merge "Update relocation packer"android-o-preview-4Dimitry Ivanov
2017-07-11Update relocation packerdimitry
Built from commit: 0acb63aaa636651deb5d55217633065ee50a7eee Test: make Change-Id: I69c461499c38e5fa7bb37d22e7d6ccfd68a65c2e
2017-07-07release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release- ↵android-build-team Robot
4163697 snap-temp-L79500000080559163 Change-Id: I3ed36e989b451c0129f14637488d28d4a6454241
2017-07-06Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: ↵Android Build Merger (Role)
b0c18f594e" into oc-dr1-dev-plus-aosp am: d5b4992a7b"
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594e" ↵jdesprez
into oc-dr1-dev-plus-aosp am: d5b4992a7b Change-Id: Ieddeea635665a32728b36b350b01e63132bd1258
2017-07-06Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: ↵Android Build Merger (Role)
5efe1f06f5" into oc-dr1-dev-plus-aosp am: 8bfe5b5c7e"
2017-07-06Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: ↵Android Build Merger (Role)
b0c18f594e" into oc-dr1-dev-plus-aosp am: d5b4992a7b"
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵jdesprez
into oc-dr1-dev-plus-aosp am: 8bfe5b5c7e Change-Id: I892c5616be709390cb4a124d79b2da838c11cf00
2017-07-06Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: ↵Android Build Merger (Role)
5efe1f06f5" into oc-dr1-dev-plus-aosp am: 728aca5301"
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594e" ↵jdesprez
into oc-dr1-dev-plus-aosp am: d5b4992a7b Change-Id: Ifea9a65465120ae2dd47300b1f0f8fc74c75e1ff
2017-07-06Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: ↵Android Build Merger (Role)
5efe1f06f5" into oc-dr1-dev-plus-aosp am: 8bfe5b5c7e"
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵jdesprez
into oc-dr1-dev-plus-aosp am: 728aca5301 Change-Id: Ia01a4d7fcf23e66820e9d0d42b2ab1a8396f0e7c
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵jdesprez
into oc-dr1-dev-plus-aosp am: 8bfe5b5c7e Change-Id: I0e462e202e784fb3326ce95955f773b9f1b0441f
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594e ↵Android Build Merger (Role)
am: 858989734c"
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵jdesprez
into oc-dr1-dev-plus-aosp am: 728aca5301 Change-Id: I7c3898c0f4091be72457591c450e6d322f1a26bf
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594ejdesprez
am: 858989734c Change-Id: I9918cb48f8ced92cefdb4bbcf8b7b2252f3600de
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594ejdesprez
am: 858989734c Change-Id: Ia480ae6052205a2c0acd9b010c3a84c42d6221a0
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594e" ↵Android Build Merger (Role)
into oc-dr1-dev-plus-aosp
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵Android Build Merger (Role)
into oc-dr1-dev-plus-aosp
2017-07-06Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" ↵Android Build Merger (Role)
into oc-dr1-dev-plus-aosp
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1jdesprez
am: 5efe1f06f5 Change-Id: I176db9b1ecc756713adff16a2a0c5ae3a0acbe77
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1jdesprez
am: b0c18f594e Change-Id: Icd651a5b2c4352525522c369649e81eefc27a2aa
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1jdesprez
am: 5efe1f06f5 Change-Id: I2be7bc8b77b9871fed02a4c362277fd3b386b1f9
2017-07-06Update ddmlib to get timeout command am: 66cc81b7b1jdesprez
am: b0c18f594e Change-Id: I52959b3aa02feaa144d03ea6a88346a03b2b32f7
2017-07-06Update ddmlib to get timeout commandjdesprez
am: 66cc81b7b1 Change-Id: I610a9a9827010ca47ce05f6245f1d48630d3d241
2017-07-06Update ddmlib to get timeout commandjdesprez
am: 66cc81b7b1 Change-Id: I6e4dbbf3ff8b342637b2ad7315f82cde39ad78bc
2017-07-03Update ddmlib to get timeout commandjdesprez
Test: build tf,cts, unit tests TF,cts Bug: 37269563 Change-Id: I5fe0bf17f50f83362c4fb49d5079b646316c27f5
2017-06-22Merge "Add asm-analysis-5.2.jar" am: 3e120da701 am: 577bdcfa99 am: ↵Alan Leung
699aff145f -s ours am: fb728cad27 -s ours Change-Id: If343fdfff3e849ddb4214b70ff04f311f6663b31
2017-06-22Merge "Add asm-analysis-5.2.jar" am: 3e120da701 am: 577bdcfa99Alan Leung
am: 699aff145f -s ours Change-Id: I98d1d4484ff40f1170cc1173bdda74aa425e10ed
2017-06-22Merge "Add asm-analysis-5.2.jar" am: 3e120da701Alan Leung
am: 577bdcfa99 Change-Id: I9e6f2b1daa2e29419956bc0b369c0972bcc41bd0
2017-06-22Merge "Add asm-analysis-5.2.jar"Alan Leung
am: 3e120da701 Change-Id: I9853140cbdeeecd30bc70112baa5756bdea73f8e
2017-06-22Merge "Add asm-analysis-5.2.jar"Treehugger Robot
2017-06-22Add asm-analysis-5.2.jarAlan Leung
Test: make Merged-In: I18fb0b79e348aba0848dbdd104ea9ab05c9ca169 Change-Id: I18fb0b79e348aba0848dbdd104ea9ab05c9ca169 (cherry picked from commit c71a043dc61979e185732f965a71f661e1e2fb8e)
2017-06-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-build-team Robot
4111654 snap-temp-L22900000075285650 Change-Id: I5d96ed3d878a78c2b7e368843262e905d7688710