Anton Hansson 0e2d985d50 resolve merge conflicts of b5b796adcd to qt-dev-plus-aosp ... Test: presubmit Bug: None Merged-In: I24a5382649c64d36fd05a59bc87faca87e6f0eb8 Change-Id: I8c40cfba7b06cf3b431528eb94957022278edbbe		2019-05-01 13:15:22 +01:00
..
26.0	Adding vendor_apex_file for /vendor/apex	2019-04-25 02:54:14 +09:00
27.0	Merge "Adding vendor_apex_file for /vendor/apex" am: 91c35aeab6	2019-04-24 16:57:07 -07:00
28.0	resolve merge conflicts of b5b796adcd to qt-dev-plus-aosp	2019-05-01 13:15:22 +01:00