Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Snap for 5978242 from 17889cf47092ff1e268a11554bed8f1e6da84706 to rvc-releaseandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-platform-release | android-build-team Robot | 2019-10-31 | 0 | -0/+0 |
|\ | | | | | | | Change-Id: I8907d89fd556d987219ebff72fcaa0b87cf84588 | ||||
| * | [automerger skipped] DO NOT MERGE - ↵android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-release | Xin Li | 2019-10-30 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: d8f650f3b3 am: 4157616ba2 -s ours am skip reason: subject contains skip directive Change-Id: I3a78276b761340dc263da8cc6929f33888938fb4 | ||||
| | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2 | Xin Li | 2019-10-30 | 0 | -0/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: d8f650f3b3 Change-Id: I1acede87cc726baf81bb0d970c0102efad2da107 | ||||
| | | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1 | Xin Li | 2019-10-30 | 0 | -0/+0 |
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: Ib124a4f5d9308a0ca2769a02926cc3d63124f8be | ||||
* | | | | Snap for 5864382 from 879d340c83f4cc0925a072e5a87492b5789a2fad to rvc-release | android-build-team Robot | 2019-09-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | Change-Id: I90f9bc59ad5ebd2632d8637ff22f615097ccbe10 | ||||
| * | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵ | Xin Li | 2019-09-08 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 3ee74659ab -s ours am: 95c3139bbe -s ours am: 44f759e325 -s ours am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history Change-Id: I7af34669aa1f8b64e6978ad5499c12c8b1835068 | ||||
| | * | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵ | Xin Li | 2019-09-08 | 0 | -0/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 3ee74659ab -s ours am: 95c3139bbe -s ours am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history Change-Id: Ie7c42e9c6aca53906e43331a4aa04b6a971e9512 | ||||
| | | * | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵ | Xin Li | 2019-09-08 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 3ee74659ab -s ours am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history Change-Id: Ib0b25b156528af6345b929d6a77d96733f0c27fd | ||||
| | | | * | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master | Xin Li | 2019-09-08 | 0 | -0/+0 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I87847ccc720222685cfe40e5f691e721a14ded55 Merged-In: I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 | ||||
* | | | | | | Snap for 5860386 from 7ab40c993f398a44b20a39cfb739faeff7b22433 to rvc-release | android-build-team Robot | 2019-09-07 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I921cb6981f0dc31f7ddacfa80dda7138d74215fc | ||||
| * | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵ | Xin Li | 2019-09-05 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 607711c60d -s ours am: 1c80c1a7ca am: 654ec85e9f am: 6062813488 -s ours am skip reason: subject contains skip directive Change-Id: I69fda8d8f299b122cbe3ec14b9daa5f04bc6def1 | ||||
| | * | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵ | Xin Li | 2019-09-05 | 0 | -0/+0 |
| | |\| | | | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 607711c60d -s ours am: 1c80c1a7ca am: 654ec85e9f Change-Id: Ia15c53774100f49b0be7e3002f2b0f88fdd7414d | ||||
| | | * | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵ | Xin Li | 2019-09-05 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 607711c60d -s ours am: 1c80c1a7ca Change-Id: Ibe0e69d460450921306ed8df182a584dc1cacf08 | ||||
| | | * | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master | Xin Li | 2019-09-05 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 607711c60d -s ours am skip reason: subject contains skip directive Change-Id: Ie43472367fc03804ff223b62f3a0202f98fd43d7 | ||||
| | | | * | DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21 | Xin Li | 2019-09-04 | 2 | -1/+12 |
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | Bug: 139893257 Change-Id: I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 | ||||
* | | | | | Snap for 5706589 from 47691a2b4ba6a58659c50ac995f6edacafa76ac3 to rvc-release | android-build-team Robot | 2019-07-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | Change-Id: I1d54df0590d8fed5029d0b7ecec60054d4e52b4c | ||||
| * | | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵ | Xin Li | 2019-07-02 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: 548937158e am: 6754bb0e0e -s ours am skip reason: subject contains skip directive Change-Id: I8f26e7a11a112f7c14c3df27e3b4d62a55fe57cf | ||||
| | * | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵ | Xin Li | 2019-07-02 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 548937158e Change-Id: I1ffe6c92d39762bdc5509f23e9e0caff019a54b4 | ||||
| | | * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵ | Xin Li | 2019-07-01 | 2 | -1/+12 |
| | | |\ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: I252d51ce69e5862e5723bc2e3e15276726d13908 | ||||
* | | | | Snap for 5537253 from 871eef0f7464087b4b0064a46870a102aeda25e2 to rvc-release | android-build-team Robot | 2019-05-07 | 1 | -1/+4 |
|\| | | | | | | | | | | | | | | | Change-Id: Ic0cd5f064b25299aafb9eb84683991bea040cd76 | ||||
| * | | | Modify gralloc0 implementation am: 9b04e0a9f4 | Valerie Hau | 2019-05-06 | 1 | -1/+4 |
|/| | | | |/ / | | | | | | | | | | | | | am: eac1c3d306 Change-Id: I553b764882a4217b80c1f4f93a453ee7da2c705e | ||||
| * | | Modify gralloc0 implementation | Valerie Hau | 2019-05-06 | 1 | -1/+4 |
|/| | | | | | | | | | | | | | | | | | am: 9b04e0a9f4 Change-Id: I9983fb22003c0d94830e2b7341d2f19bab0d9bd4 | ||||
| * | | Modify gralloc0 implementationandroid-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release | Valerie Hau | 2019-05-02 | 1 | -1/+4 |
|/ / | | | | | | | | | | | | | | | Add validateBufferSize and getTransportSize Bug: 131089111 Test: build, boot Change-Id: I052f9537fa1b37a4a7b2f5d82309aff3d2e1f2f3 | ||||
* | | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master | Xin Li | 2019-02-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | am: e612ed0ba6 -s ours am skip reason: subject contains skip directive Change-Id: Ie0a052923250a3a583bc41cb07a3dd7e37dcddea | ||||
| * | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master | Xin Li | 2019-02-20 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | Bug: 120848293 Change-Id: I178359ad531f0194030e56de95d67ae8af87232e | ||||
* | \ | Merge ab/5111269 into master am: 816a8bb037 am: 6437e802bb | Cody Schuffelen | 2018-11-26 | 5 | -34/+58 |
|\ \ \ | | |/ | |/| | | | | | | | | | | am: 6f55538523 Change-Id: I029c73dceadda59a3e96e5bf80f94da35104445d | ||||
| * | | Merge ab/5111269 into master am: 816a8bb037 | Cody Schuffelen | 2018-11-26 | 5 | -34/+58 |
| |\| | | | | | | | | | | | | | | | | am: 6437e802bb Change-Id: I67ae198166a09649c70d71bcdd007bf67a6fb28a | ||||
| | * | Merge ab/5111269 into master | Cody Schuffelen | 2018-11-26 | 5 | -34/+58 |
| | |\ | | | | | | | | | | | | | | | | | | | | | am: 816a8bb037 Change-Id: I2afd0756285435d56a592b122432959b683c566a | ||||
| | | * | Merge ab/5111269 into masterandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1 | Cody Schuffelen | 2018-11-19 | 5 | -34/+58 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | Test: TH Bug: 119522286 Change-Id: I0481b3f41b2c4895b88bdd8a58d32ae02769bca7 | ||||
| | | | * | Fix implicit-fallthrough warnings in AVDVirglRenderer.cpp etc. | Chih-Hung Hsieh | 2018-11-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be a global error by default. Test: make checkbuild Bug: 112564944 Exempt-From-Owner-Approval: do not block on new warnings | ||||
| | | | * | Document why we can't build this for Mac | Greg Hartman | 2018-10-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 118466250 Test: TH Change-Id: I2858aa77749eb8637afb1e5c9e26f184ba3d525e | ||||
| | | | * | Fix build break on mac | Greg Hartman | 2018-10-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Visual inspection There's no reason that emugen wouldn't compile on the mac, and turning it off here breaks things. Change-Id: Icaa6e06a8e69d89a7739b4702a62906767c03d58 (cherry picked from commit a688f6d6369222c9bdf5bd30a7b87aafa22ed7cd) | ||||
| | | | * | Merge changes from topic "enablehostside" into cuttlefish-testing | Greg Hartman | 2018-10-17 | 5 | -32/+54 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Hack to allow compilation on oreo and oreo-mr1 Add additional Android.bp files to make libs visible | ||||
| | | | | * | Hack to allow compilation on oreo and oreo-mr1 | Greg Hartman | 2018-10-15 | 3 | -32/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2ddf71162da32b99e4c5f23bc0e505bcc43fb75e Test: Compiles | ||||
| | | | | * | Add additional Android.bp files to make libs visible | Greg Hartman | 2018-10-12 | 2 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 117561734 Test: Builds on oreo and oreo-mr1 Change-Id: Ie295ccd3ca252f35763f9ec5097075e722ed37f3 | ||||
| | | | * | | Remove spurious Android.mk | Greg Hartman | 2018-10-15 | 1 | -39/+0 |
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 117561734 Test: Local build gets further Change-Id: I96a0d285b98f97bed38a8f18657b9f12f21e6b47 | ||||
* | | | | | Merge "Silence a static analyzer warning" | TreeHugger Robot | 2018-11-01 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Silence a static analyzer warning | George Burgess IV | 2018-10-31 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our static analyzer is unhappy with this code, and thinks it has a memory leak: device/generic/opengl-transport/host/libs/virglrenderer/AVDVirglRenderer.cpp:343:38: warning: Potential leak of memory pointed to by 'config' [clang-analyzer-cplusplus.NewDeleteLeaks] While this immediately seems true, the constructor for `config` will stash a pointer to `config` in a static vector, which presumably is meant to manage the lifetime of our newly-allocated `config`. As noted in the comments, the analyzer can generally reason about that, but it gives up trying to figure out what the constructor is doing before we reach the vector's push_back. Just put a NOLINT here to make it be quiet. Bug: None Test: Ran the analyzer. It's no longer angry. Change-Id: Ida0118ef8b9ca0cd40cdd5e76489ab14cb86ea23 | ||||
* | | | | | | Fix implicit-fallthrough warnings in AVDVirglRenderer.cpp etc. am: ↵ | Chih-Hung Hsieh | 2018-10-29 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | | d282cb97c8 am: b6da014c67 am: a6b9bb3007 Change-Id: Iec0097eda096e0b216911d4dcaf458afe8542c3f | ||||
| * | | | | Fix implicit-fallthrough warnings in AVDVirglRenderer.cpp etc. am: d282cb97c8 | Chih-Hung Hsieh | 2018-10-29 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b6da014c67 Change-Id: I11815126c83eea63c1dcd56255b2ffa613f0b836 | ||||
| | * | | | Fix implicit-fallthrough warnings in AVDVirglRenderer.cpp etc. | Chih-Hung Hsieh | 2018-10-29 | 2 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d282cb97c8 Change-Id: I7c6252f82dfb9fefce714fbfb1a0e0ff38670737 | ||||
| | | * | | Fix implicit-fallthrough warnings in AVDVirglRenderer.cpp etc. | Chih-Hung Hsieh | 2018-10-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be a global error by default. Test: make checkbuild Bug: 112564944 Exempt-From-Owner-Approval: do not block on new warnings | ||||
* | | | | | Fix build break on mac am: 756d558aaf am: 167517c4e6 | Greg Hartman | 2018-10-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2e2bd25a28 Change-Id: I72c38364245e7fbd669e3412c71ccc4d8b21dab0 | ||||
| * | | | | Fix build break on mac am: 756d558aaf | Greg Hartman | 2018-10-26 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 167517c4e6 Change-Id: I8fd099791d5a4fcb1b15cde61fb35e995e968d88 | ||||
| | * | | | Fix build break on mac | Greg Hartman | 2018-10-26 | 1 | -1/+0 |
| |/| | | | | |/ / | | | | | | | | | | | | | | | | | am: 756d558aaf Change-Id: I5fc1c8f5b496a8978dfaff051a927c13f301bae0 | ||||
| | * / | Fix build break on mac | Greg Hartman | 2018-10-26 | 1 | -1/+0 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Visual inspection There's no reason that emugen wouldn't compile on the mac, and turning it off here breaks things. Change-Id: Icaa6e06a8e69d89a7739b4702a62906767c03d58 (cherry picked from commit a688f6d6369222c9bdf5bd30a7b87aafa22ed7cd) | ||||
* | | | Remove spurious Android.mk | Greg Hartman | 2018-10-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | am: 6a076d3bfa Change-Id: I9b25d0feae4d3b4702e7a9764b084cdfae91e96e | ||||
| * | | Remove spurious Android.mk | Greg Hartman | 2018-10-24 | 1 | -39/+0 |
| | | | | | | | | | | | | | | | | | | | | | BUG: 117561734 Test: Local build gets further Change-Id: I96a0d285b98f97bed38a8f18657b9f12f21e6b47 (cherry picked from commit b647927ff80c6f4f44d07c978d16936f33ff2e61) | ||||
* | | | Merging from ab/5068661 | Greg Hartman | 2018-10-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | am: 8af14a4c74 Change-Id: I485a444082b0d7a2da76df1f00535a34860a2e9c | ||||
| * | | Merging from ab/5068661 | Greg Hartman | 2018-10-24 | 3084 | -374032/+13798 |
| |\| | | | | | | | | | | | | | | | | BUG: 117514054 Test: TH Change-Id: I2fe8bc306369d45939b50d21aa6516882ca0d049 |