Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
435,502 Commits 3 Branches 0 Tags
75fcd86360ebefe7a91bc84822edb1559df7c980
Commit Graph

435502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hufnagle
75fcd86360 Merge "Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 am: 3eac945cb6" into qt-r1-dev-plus-aosp 
am: c473517748

Change-Id: I03c01341cc5f3f034b25801c6319be992b3d2bdc
 2019-07-22 15:58:38 -07:00
Android Build Merger (Role)
7a5502fea0 Merge "Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 am: 21083088e9 am: 655931d20f" 2019-07-22 22:55:30 +00:00
TreeHugger Robot
5c8d9dbbcc Merge "Remove final usage of asSkCanvas" 2019-07-22 22:54:47 +00:00
Kevin Hufnagle
07b2351189 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 am: 21083088e9 
am: 655931d20f

Change-Id: I87418f118f8e1383ac86806dc85a0e799eaf3aad
 2019-07-22 15:54:30 -07:00
Selim Cinek
88fc0c33a3 Merge "Fixed that silent notifications weren't showing on AOD" into qt-r1-dev am: 2738aa3f79 
am: 0ff5987326

Change-Id: I917ede5dfee40333c39ebf046714f03d0cfac0eb
 2019-07-22 15:50:31 -07:00
Android Build Merger (Role)
c473517748 Merge "Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 am: 3eac945cb6" into qt-r1-dev-plus-aosp 2019-07-22 22:37:54 +00:00
Kevin Hufnagle
655931d20f Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 
am: 21083088e9

Change-Id: I257f23f7a7a463d53f187fe36e4ce4208d2aa9eb
 2019-07-22 15:37:02 -07:00
Kevin Hufnagle
3a3ef9632a Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64 
am: 3eac945cb6

Change-Id: I6e0317cb6014b3869796740aede0eb6ed53cdee1
 2019-07-22 15:37:01 -07:00
Selim Cinek
0ff5987326 Merge "Fixed that silent notifications weren't showing on AOD" into qt-r1-dev 
am: 2738aa3f79

Change-Id: Ie5be54dffcfb61dfc6ea71bcd960634202dc8265
 2019-07-22 15:27:30 -07:00
Kevin Hufnagle
21083088e9 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev 
am: 2839f24e64

Change-Id: I4d888ec589953a02238520de0594d751fda3e6d0
 2019-07-22 15:23:56 -07:00
Kevin Hufnagle
3eac945cb6 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev 
am: 2839f24e64

Change-Id: Ie058fa4312e0ee5e411ee0d0a2f0e49c5362c7c2
 2019-07-22 15:23:56 -07:00
Kevin Hufnagle
2839f24e64 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev 2019-07-22 22:01:49 +00:00
TreeHugger Robot
2738aa3f79 Merge "Fixed that silent notifications weren't showing on AOD" into qt-r1-dev 2019-07-22 21:51:11 +00:00
TreeHugger Robot
bfda3a2b75 Merge "Changing the dimens of handle bar to look good in cars" 2019-07-22 21:41:30 +00:00
Bill Yi
0362c25277 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a2bee96aac -s ours 
am: c5bf72a736 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieab9244337e3c72a62db5d069bdd91001ee84243
 2019-07-22 14:39:32 -07:00
Bill Yi
c5bf72a736 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: a2bee96aac -s ours
am skip reason: subject contains skip directive

Change-Id: I4c41dd878ec20d637002b7dcd1298eebff267134
 2019-07-22 14:23:57 -07:00
TreeHugger Robot
a2bee96aac Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-22 21:12:34 +00:00
Bill Yi
d851c0d8c9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours am: ae841ab54e -s ours 
am: 4e48fd226e -s ours
am skip reason: subject contains skip directive

Change-Id: I57b47245565825365356233e97a5ee70ca874e13
 2019-07-22 13:31:19 -07:00
Bill Yi
b4fe7b070f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours am: 9a259d5dea -s ours 
am: 167cb383b6 -s ours
am skip reason: subject contains skip directive

Change-Id: Idddff624b8f352cef74b0281b8a35cc60c6fb5e6
 2019-07-22 13:24:23 -07:00
Bill Yi
cc814f774c [automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 27c67b2bf1 -s ours 
am: 50daa9a78f -s ours
am skip reason: subject contains skip directive

Change-Id: I6badf436712935b88487afb2b881b54203a214bc
 2019-07-22 13:15:19 -07:00
TreeHugger Robot
d63accd8bd Merge "Fix minor typo" 2019-07-22 20:07:38 +00:00
Android Build Merger (Role)
4e48fd226e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours am: ae841ab54e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-22 19:56:04 +00:00
Bill Yi
d4f48b689a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours 
am: ae841ab54e -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb177da0da34e78960a0e5929f8738d46d8883af
 2019-07-22 12:55:29 -07:00
Bill Yi
d387b1b2b9 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 76a64e725c -s ours 
am: 22fce7c88c -s ours
am skip reason: subject contains skip directive

Change-Id: I31b98eb4704ccb706ae9d5a5d3273ea89eccd246
 2019-07-22 12:54:55 -07:00
Bill Yi
167cb383b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours 
am: 9a259d5dea -s ours
am skip reason: subject contains skip directive

Change-Id: I4f33b4d7230f327934c3572c2f8a89e0b1b5adeb
 2019-07-22 12:54:14 -07:00
John Reck
296c5ef20e Merge "Increase dequeueBuffer timeout" into qt-r1-dev am: 5ab5cd7aa2 
am: 6769f25c17

Change-Id: I13931cd14fead1141acbea5cef8deb61a6c9119e
 2019-07-22 12:51:21 -07:00
Bill Yi
57e1e73bad [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 1b7a70123b -s ours 
am: de7087b5b2 -s ours
am skip reason: subject contains skip directive

Change-Id: If79c99c5ae9a1a4775db57fae98657589ef015de
 2019-07-22 12:43:45 -07:00
Bill Yi
50daa9a78f [automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours 
am: 27c67b2bf1 -s ours
am skip reason: subject contains skip directive

Change-Id: I11fdcfdc182fd07ba9a8f2dddf87810e0322621e
 2019-07-22 12:38:52 -07:00
Android Build Merger (Role)
22fce7c88c Merge "[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 76a64e725c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-22 19:36:14 +00:00
Bill Yi
268a19822d [automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours 
am: 76a64e725c -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4ed166f31bfe390769f853c169a1b661dd811e0
 2019-07-22 12:35:39 -07:00
John Reck
6769f25c17 Merge "Increase dequeueBuffer timeout" into qt-r1-dev 
am: 5ab5cd7aa2

Change-Id: Ia32a0b1177a5e7160680e1d4c9c40ff23075c431
 2019-07-22 12:34:30 -07:00
Bill Yi
ae841ab54e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: bde6a92a55 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b84532c9db62f7155bd4683d9b0b02484f93271
 2019-07-22 12:33:23 -07:00
Bill Yi
9a259d5dea [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: bde6a92a55 -s ours
am skip reason: subject contains skip directive

Change-Id: I159f2fa61e2171cbbe56f77c047774a1bc3d9007
 2019-07-22 12:30:38 -07:00
Mathew Inwood
489e34f540 Merge "Always apply compat changes to system apps." am: e691553aa6 am: fe17bdccf9 am: ebd7b1c2ea 
am: 047704a01f

Change-Id: I9aed8a916fc33862596737c00bb136d6850e64f5
 2019-07-22 12:27:56 -07:00
Andrei Onea
cbc294692c [automerger skipped] resolve merge conflicts of 1faafcb488 to stage-aosp-master am: d7ecd0d24d -s ours am: 711f375337 -s ours 
am: 38d254358d -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5ca9 is in history

Change-Id: Ic01b6410f413a4b44f59955691399d9895c00c43
 2019-07-22 12:22:27 -07:00
Bill Yi
27c67b2bf1 [automerger skipped] Import translations. DO NOT MERGE 
am: 09da14be40 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c14d343f3b05b4b292b3e7497af042141bf8c98
 2019-07-22 12:21:56 -07:00
Bill Yi
76a64e725c [automerger skipped] Import translations. DO NOT MERGE 
am: 09da14be40 -s ours
am skip reason: subject contains skip directive

Change-Id: I431dd3f3d3c535610ef2d5f48bd8543a4dc92066
 2019-07-22 12:20:48 -07:00
Bill Yi
de7087b5b2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 1b7a70123b -s ours
am skip reason: subject contains skip directive

Change-Id: Ied523f24666ed0d4d2e7bcb563d54e6d005179b3
 2019-07-22 12:20:24 -07:00
John Reck
5ab5cd7aa2 Merge "Increase dequeueBuffer timeout" into qt-r1-dev 2019-07-22 19:18:38 +00:00
Mathew Inwood
047704a01f Merge "Always apply compat changes to system apps." am: e691553aa6 am: fe17bdccf9 
am: ebd7b1c2ea

Change-Id: I790378ff858887374b4384f7f78cc87af5e163f8
 2019-07-22 12:11:36 -07:00
TreeHugger Robot
bde6a92a55 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-07-22 19:08:22 +00:00
TreeHugger Robot
1b7a70123b Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-22 19:03:31 +00:00
Andrei Onea
38d254358d [automerger skipped] resolve merge conflicts of 1faafcb488 to stage-aosp-master am: d7ecd0d24d -s ours 
am: 711f375337 -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5ca9 is in history

Change-Id: I573c33a3b314d976c6fd344fbf68f128538455fd
 2019-07-22 12:02:05 -07:00
Mathew Inwood
ebd7b1c2ea Merge "Always apply compat changes to system apps." am: e691553aa6 
am: fe17bdccf9

Change-Id: I686647d8fa95d8fd788e76c48f518ebd51e6440e
 2019-07-22 11:59:11 -07:00
Andrei Onea
711f375337 [automerger skipped] resolve merge conflicts of 1faafcb488 to stage-aosp-master 
am: d7ecd0d24d -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5ca9 is in history

Change-Id: Ic3931ede8ddc760f883f218ff671d684fe65152c
 2019-07-22 11:50:45 -07:00
Mathew Inwood
fe17bdccf9 Merge "Always apply compat changes to system apps." 
am: e691553aa6

Change-Id: I85cba145cfe4258697c07831358292e9f4a03477
 2019-07-22 11:49:28 -07:00
Nick Cook
aef62d1e6c Merge "Merge "docs: Fix broken link." into qt-dev am: 2aec022fd2 am: 82252f17d3" into qt-r1-dev-plus-aosp 
am: 174539860d

Change-Id: Icf9521e274922c79ecc86d8c37a021249725033e
 2019-07-22 11:05:30 -07:00
Nick Cook
bd5effc8d8 Merge "docs: Fix broken link." into qt-dev am: 2aec022fd2 am: 3fd9f9aaf9 
am: 9a2dbf3c80

Change-Id: I099a1dad5b0910693a7836abe2c517903d2c2bb6
 2019-07-22 11:02:14 -07:00
Bill Yi
09da14be40 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8688211f4bb949f51359257a442b81d62e7057bf
 2019-07-22 11:01:57 -07:00
Bill Yi
75093f4f5d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9e12ebb9c597b7393a32d78a7b15c830326c2915
 2019-07-22 11:00:54 -07:00