summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-28Create CarHTMLViewer for car buildsYabin Huang
Bug: 185951366 Test: manual Change-Id: Ie700b513de4163e119ac6595ecafe66dfbfd3b44
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c16a3e3e6 -s ↵Xin Li
ours am: 430d20d046 -s ours am: 1c15a66634 -s ours am skip reason: Change-Id I71ae706b6893ed47cf456938b35ed5e2b319ea50 with SHA-1 0514655f3b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id9abeea3d6abd5b81eb86c8d51eff42078d17e67
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewer" am: ↵Bob Badour
320665d29e am: f632078354 am: 3e78647ad1 am: afe0ac0e9b Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1587750 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87d03e90405937fcebfb77d6e56f9f49fb9a7ad3
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c16a3e3e6 -s ↵Xin Li
ours am: 430d20d046 -s ours am skip reason: Change-Id I71ae706b6893ed47cf456938b35ed5e2b319ea50 with SHA-1 0514655f3b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifaec1b7ea6a7511296dbca38ef72618ff163f882
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewer" am: ↵Bob Badour
320665d29e am: f632078354 am: 3e78647ad1 Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1587750 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibb0b724f27626841e983470ec99f98c7461c61c1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c16a3e3e6 -s oursXin Li
am skip reason: Change-Id I71ae706b6893ed47cf456938b35ed5e2b319ea50 with SHA-1 0514655f3b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1925495b9bf61d2a731630c857003a9143c89d1
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I71ae706b6893ed47cf456938b35ed5e2b319ea50 Change-Id: Ie61329fd2a0a91e164fc03d39204dac621070ecb
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewer" am: ↵Bob Badour
320665d29e am: f632078354 Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1587750 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I393862ebff2aea5480eaca826d04b9adb9c611cb
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewer" am: 320665d29eBob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1587750 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6f770c460b079e0310111e7efb16cec4fb98e34
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewer"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/HTMLViewerBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I289366fc380f484a21e12e59629724208a6920cb
2020-11-23Mark ab/6881855 as merged am: 90a0ea6209 am: 0514655f3bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/13113079 Change-Id: Ie3661e27b5a98446f87a1cf9a0a0049c765bf772
2020-11-23Mark ab/6881855 as merged am: 90a0ea6209Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/13113079 Change-Id: I71ae706b6893ed47cf456938b35ed5e2b319ea50
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I4fb85c7f51afc578a9628cec941d8438410b6fb7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 294b0ac73e -s ours am: ↵Xin Li
844a3ceacc -s ours am: 428ec36f8e -s ours am skip reason: Change-Id I646b9f76a86f6a95189bc83ed370b3c79714884b with SHA-1 9404a71cbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12797459 Change-Id: I1fca5f1f3173cd58faa89eb97766647e3073b0d1
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 294b0ac73e -s ours am: ↵Xin Li
844a3ceacc -s ours am skip reason: Change-Id I646b9f76a86f6a95189bc83ed370b3c79714884b with SHA-1 9404a71cbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12797459 Change-Id: Ib016d1607ea26483101b4e025f3b43b49d6e8f02
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 294b0ac73e -s oursXin Li
am skip reason: Change-Id I646b9f76a86f6a95189bc83ed370b3c79714884b with SHA-1 9404a71cbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12797459 Change-Id: I9dfba8ce915f9b305738f6d58c3fa9c8e3a35fc5
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I646b9f76a86f6a95189bc83ed370b3c79714884b Change-Id: I57470d680c33cacbfba8e6acad4e287a644544fc
2020-09-30Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944 am: 0d6aa27c18 ↵Treehugger Robot
am: 4669207d50 am: b4fceff66c am: b1b74f0e87 Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1441294 Change-Id: I9cf8417d4542bcdf1e8ddd7160ea1bf6ed8bd556
2020-09-30Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944 am: 0d6aa27c18 ↵Treehugger Robot
am: 4669207d50 am: b4fceff66c Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1441294 Change-Id: I1d17159ff18a987343c721b3ce61033454df21e1
2020-09-30Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944 am: 0d6aa27c18 ↵Treehugger Robot
am: 4669207d50 Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1441294 Change-Id: Id1d65a59378fb9cd9cc7463816eee172784fd345
2020-09-30Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944 am: 0d6aa27c18Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1441294 Change-Id: Ic492e36eba9b85699a03da994762903755c979db
2020-09-30Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1441294 Change-Id: Ia4662da97fbb894f16af34b64c305623522724cf
2020-09-30Merge "Transfer ownership of HTMLViewer app."Treehugger Robot
2020-09-29Transfer ownership of HTMLViewer app.David Nelloms
Test: no-op change. Change-Id: I4da1cd661df77dd2d7c7b66e3ca8c1a66bf0026c
2020-09-11[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: ↵Xin Li
717d0af7c5 -s ours am: 9a83aea707 -s ours am: 0ace9bb9ac -s ours am: 3a8e00eef7 -s ours am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1422339 Change-Id: I086a17c83601ea32e6aced1a0dc639d6933580d2
2020-09-11[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: ↵Xin Li
717d0af7c5 -s ours am: 9a83aea707 -s ours am: 0ace9bb9ac -s ours am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1422339 Change-Id: I3f3f6001e8c181672f0b3ae54a17c474abeeeb5c
2020-09-11[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: ↵Xin Li
717d0af7c5 -s ours am: 9a83aea707 -s ours am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1422339 Change-Id: I992e9dd8d375ca1958ebb0d3f9750804bf67a0e7
2020-09-11[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s ours am: ↵Xin Li
717d0af7c5 -s ours am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1422339 Change-Id: Ie6b32d69ebd851842c5a3541dd5b21926af6bb60
2020-09-11[automerger skipped] Merge "Merge Android R" am: a17b9c62f7 -s oursXin Li
am skip reason: Change-Id Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b with SHA-1 ecde83a0b4 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1422339 Change-Id: Idc4eafe4a5e9589d310baf692480b794e410da0d
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b Change-Id: If36d425de1ee29ba94997db61060e1e5e4b695ec
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am: 5d367f2880 -s ours am: 42d26f5a89 -s ours am: d696342b04 -s ours am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12470134 Change-Id: Ib947300af4a86208b6660b868a696f5b6be0a97e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am: 5d367f2880 -s ours am: 42d26f5a89 -s ours am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12470134 Change-Id: I918c764e9f601d0cd8ccb27805f760dbf9ce3c6f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am: 5d367f2880 -s ours am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12470134 Change-Id: I32abb636516e0afcae6cb68c4a32d28c472e4ff3
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/12470134 Change-Id: I0d98c15804bfd1f01db217bd4347211295cb019d
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I46de99eddcff6f2866919a6d807236b6bd80416c Change-Id: Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
ad709f9d80 -s ours am: 57dfe7ec97 -s ours am: d53a288bbf -s ours am: 9404a71cbe -s ours am: 7b9ef3d286 -s ours am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1323632 Change-Id: I2be7f283b15006551c469c980e0d691975a77fd0
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
ad709f9d80 -s ours am: 57dfe7ec97 -s ours am: d53a288bbf -s ours am: 9404a71cbe -s ours am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1323632 Change-Id: Icf496a0a956b55975de5ac38e46ca838a50e1abf
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
ad709f9d80 -s ours am: 57dfe7ec97 -s ours am: d53a288bbf -s ours am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1323632 Change-Id: I646b9f76a86f6a95189bc83ed370b3c79714884b
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
ad709f9d80 -s ours am: 57dfe7ec97 -s ours am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1323632 Change-Id: I46de99eddcff6f2866919a6d807236b6bd80416c
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
ad709f9d80 -s ours am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/1323632 Change-Id: I6f06ce8419f83245165f0752cc180a60886b6105
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2Xin Li
2020-06-03Merge QQ3A.200605.002 into masterXin Li
Bug: 158095402 Merged-In: I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c Change-Id: I50baca8ad154cb2e15e4f0d39996de3085d10ac7
2020-05-20Merge "Add an exported flag in manifest" am: eacac535cb am: 95439e8839 am: ↵Treehugger Robot
3b44b62877 am: c26cc79fe0 am: f55e601792 Change-Id: I222f52a633a2a419c89aa10ffb31b2b2dfd25c30
2020-05-20Merge "Add an exported flag in manifest" am: eacac535cb am: 95439e8839 am: ↵Treehugger Robot
3b44b62877 am: c26cc79fe0 Change-Id: Ied5b49b31a12e8bcaf332beba515b1cd4713225d
2020-05-20Merge "Add an exported flag in manifest" am: eacac535cb am: 95439e8839 am: ↵Treehugger Robot
3b44b62877 Change-Id: Ib78ca729253abf58ba447c2d8c38a507ea9dd27a
2020-05-20Merge "Add an exported flag in manifest" am: eacac535cb am: 95439e8839Treehugger Robot
Change-Id: I510a44c5893dd8a03f0303ade099b3e8eaffd32a
2020-05-20Merge "Add an exported flag in manifest" am: eacac535cbtemp_QQ3A.200605.002Treehugger Robot
Change-Id: I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c
2020-05-20Merge "Add an exported flag in manifest"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 20:09:10 +0000