platform_packages_apps_SpareParts, branch android11-tests-release Unnamed repository; edit this file 'description' to name the repository. [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master 2019-02-24T10:03:32+00:00 Xin Li delphij@google.com 2019-02-24T10:03:32+00:00 f3d46ceeecd71c5555939f32643c18c78ae7909f am: b6ba49e6af -s ours am skip reason: subject contains skip directive Change-Id: Ia7aaa47f1bee01d0c566dd90475ea01c6a0b3534 
am: b6ba49e6af -s ours
am skip reason: subject contains skip directive

Change-Id: Ia7aaa47f1bee01d0c566dd90475ea01c6a0b3534
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master 2019-02-21T00:19:47+00:00 Xin Li delphij@google.com 2019-02-21T00:19:47+00:00 b6ba49e6afb7a0a62f881247852228b16d103958 Bug: 120848293 Change-Id: Ifd28bab426a29d2b55400cafc387e287a7e46b86 
Bug: 120848293
Change-Id: Ifd28bab426a29d2b55400cafc387e287a7e46b86
Merge "Convert Android.mk file to Android.bp" am: da44f9cf37 am: 56c2c6c8ca 2019-01-14T23:48:27+00:00 Sasha Smundak asmundak@google.com 2019-01-14T23:48:27+00:00 da8582eb984f18722440666d57c4c11cff2a75e1 am: c135cdbe7a Change-Id: Id75aacff8001d0279233f949839a1502e6e1580e 
am: c135cdbe7a

Change-Id: Id75aacff8001d0279233f949839a1502e6e1580e
Merge "Convert Android.mk file to Android.bp" am: da44f9cf37 2019-01-14T23:00:37+00:00 Sasha Smundak asmundak@google.com 2019-01-14T23:00:37+00:00 c135cdbe7aee0ec80e2882b1aa5bc5b2adac93a5 am: 56c2c6c8ca Change-Id: Ifc35d5117be9b9bfbb9c802baf240729ecb88bbc 
am: 56c2c6c8ca

Change-Id: Ifc35d5117be9b9bfbb9c802baf240729ecb88bbc
Merge "Convert Android.mk file to Android.bp" 2019-01-14T22:11:41+00:00 Sasha Smundak asmundak@google.com 2019-01-14T22:11:41+00:00 56c2c6c8ca6c3455427bb3565044738b8e2e837b am: da44f9cf37 Change-Id: Iedd6feeb669461280878dab1842412c73a17f633 
am: da44f9cf37

Change-Id: Iedd6feeb669461280878dab1842412c73a17f633
Merge "Convert Android.mk file to Android.bp" 2019-01-14T21:54:19+00:00 Treehugger Robot treehugger-gerrit@google.com 2019-01-14T21:54:19+00:00 da44f9cf374cbac968339a230540866fc7429496 






Convert Android.mk file to Android.bp
2019-01-11T22:02:51+00:00

Sasha Smundak
asmundak@google.com

2019-01-11T22:02:51+00:00

d04c97396cfa5ce049cfab6f203c57e0f9b329f9

See build/soong/README.md for more information.

Change-Id: Ic40a55ebd9b209b41fbe9ba34215ba93e46678ea
Fixes: 122332584
Test: treehugger





See build/soong/README.md for more information.

Change-Id: Ic40a55ebd9b209b41fbe9ba34215ba93e46678ea
Fixes: 122332584
Test: treehugger







[automerger skipped] Merge "DO NOT MERGE" am: 07decfc669  -s ours am: 69e8cc5566  -s ours
2018-12-10T20:57:37+00:00

Xin Li
delphij@google.com

2018-12-10T20:57:37+00:00

1d1367f0d89bb3936b9dfebee1df657c0cc5a069

am: 636078473d  -s ours

Change-Id: Ie09b5df3dd081f998ed116b1287c61866dd3aef4





am: 636078473d  -s ours

Change-Id: Ie09b5df3dd081f998ed116b1287c61866dd3aef4







[automerger skipped] Merge "DO NOT MERGE" am: 07decfc669  -s ours
2018-12-10T19:14:48+00:00

Xin Li
delphij@google.com

2018-12-10T19:14:48+00:00

636078473dc6fdd88697c441503936d5129a0eca

am: 69e8cc5566  -s ours

Change-Id: Ib0bfa35215c362c1223003a074e93680eac2e929





am: 69e8cc5566  -s ours

Change-Id: Ib0bfa35215c362c1223003a074e93680eac2e929







[automerger skipped] Merge "DO NOT MERGE"
2018-12-10T18:11:47+00:00

Xin Li
delphij@google.com

2018-12-10T18:11:47+00:00

69e8cc55665b66ec912cdbd4021b06123df4f6b9

am: 07decfc669  -s ours

Change-Id: I1da9c9c8d64c88c076a17154a24f171b9264be9b





am: 07decfc669  -s ours

Change-Id: I1da9c9c8d64c88c076a17154a24f171b9264be9b