Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
368,438 Commits 3 Branches 0 Tags
f8fe538f07d38d5d7ed751d4ad57edfa0be4e8bd
Commit Graph

368438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f8fe538f07 Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev am: c70d882667 am: c262f7a96a 
am: ac40bb76a1

Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5
 2018-06-11 15:43:09 -07:00
Bill Yi
9b70877ea8 [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39 am: b1615a6d90 -s ours am: 2c56e9b54b -s ours 
am: c37cca5739  -s ours

Change-Id: If954d237d06c522c78198b0fadd8c6394978855a
 2018-06-11 15:35:45 -07:00
Bill Yi
88db3b5aae Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev am: 836d1db239 am: f527941ec8 
am: f4a3d1faf2

Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f
 2018-06-11 15:17:06 -07:00
Bill Yi
7609e23612 [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999 -s ours am: f9efc3043a -s ours 
am: 9e7657c13d  -s ours

Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc
 2018-06-11 15:09:52 -07:00
Bill Yi
995c542d0c Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 am: 24701167ba 
am: 689cf0f8a2

Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c
 2018-06-11 15:04:23 -07:00
Bill Yi
7cea26fc9e [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650 -s ours am: f2ce740a1e -s ours 
am: b10ebef583  -s ours

Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085
 2018-06-11 14:57:09 -07:00
Bill Yi
6dbef2a740 Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f am: 2b605d89b9 
am: 64c1873c30

Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376
 2018-06-11 14:51:44 -07:00
Bill Yi
287d484b23 [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 am: dafe5854dd -s ours am: 0c61c9baf6 -s ours 
am: 7567755399  -s ours

Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb
 2018-06-11 14:44:34 -07:00
Bill Yi
ac40bb76a1 Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev am: c70d882667 
am: c262f7a96a

Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4
 2018-06-11 14:43:19 -07:00
Bill Yi
c37cca5739 [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39 am: b1615a6d90 -s ours 
am: 2c56e9b54b  -s ours

Change-Id: I947aee957d91c286204282e84162e9733ace9018
 2018-06-11 14:36:55 -07:00
Bill Yi
f4a3d1faf2 Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev am: 836d1db239 
am: f527941ec8

Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1
 2018-06-11 14:31:45 -07:00
Bill Yi
9e7657c13d [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999 -s ours 
am: f9efc3043a  -s ours

Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b
 2018-06-11 14:25:28 -07:00
Bill Yi
689cf0f8a2 Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 
am: 24701167ba

Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7
 2018-06-11 14:01:09 -07:00
Bill Yi
b10ebef583 [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650 -s ours 
am: f2ce740a1e  -s ours

Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071
 2018-06-11 13:54:34 -07:00
Bill Yi
64c1873c30 Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f 
am: 2b605d89b9

Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d
 2018-06-11 13:49:02 -07:00
Bill Yi
7567755399 [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 am: dafe5854dd -s ours 
am: 0c61c9baf6  -s ours

Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9
 2018-06-11 13:42:05 -07:00
Bill Yi
a5f49873c1 Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7 am: 9ce893db7d 
am: 053160d965

Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3
 2018-06-11 12:52:45 -07:00
Bill Yi
b63aa6d5bb [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f -s ours am: 2e113959ff -s ours 
am: 5caff8b3ac  -s ours

Change-Id: I23a3341bc16e52343d398489b7e74a7903421cac
 2018-06-11 12:44:22 -07:00
Bill Yi
053160d965 Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7 
am: 9ce893db7d

Change-Id: Ib2119bdd41d9266be01a34281f2b414a9d4d6d32
 2018-06-11 12:34:18 -07:00
Bill Yi
5caff8b3ac [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d am: d82564708f -s ours 
am: 2e113959ff  -s ours

Change-Id: I4e9f42dca080b08b61f706bb474c31c1ee1db4e5
 2018-06-11 12:27:12 -07:00
Bill Yi
c262f7a96a Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev 
am: c70d882667

Change-Id: I12e4db4d4d67cac9aa22f9c3fab1d141f29eb54b
 2018-06-11 12:26:55 -07:00
Bill Yi
2c56e9b54b [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39 
am: b1615a6d90  -s ours

Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28
 2018-06-11 12:24:25 -07:00
Bill Yi
f527941ec8 Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev 
am: 836d1db239

Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e
 2018-06-11 12:19:55 -07:00
Bill Yi
f9efc3043a [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe 
am: 6d30123999  -s ours

Change-Id: I1f2ad23fa8c9975b1be5e089a4001e5871958aee
 2018-06-11 12:17:38 -07:00
Bill Yi
a3a2117e5f Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a am: 34d73a6f77 
am: 331b188275

Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150
 2018-06-11 12:10:01 -07:00
Bill Yi
4256a29fcc [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793 -s ours am: b5af202209 -s ours 
am: 6c409c2e99  -s ours

Change-Id: I1c2d8f7e5ccffd726c7111bb46e87e74616a28a4
 2018-06-11 12:01:59 -07:00
Bill Yi
73eb5fee8d [automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 am: 4228af93a7 -s ours am: fcd7cc11c7 -s ours 
am: 927396047c  -s ours

Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2
 2018-06-11 12:00:13 -07:00
Bill Yi
24701167ba Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev 
am: 3bbe3c7c93

Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef
 2018-06-11 11:56:42 -07:00
Bill Yi
f2ce740a1e [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce 
am: 71f5cfa650  -s ours

Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f
 2018-06-11 11:54:34 -07:00
Bill Yi
331b188275 Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a 
am: 34d73a6f77

Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950
 2018-06-11 11:52:05 -07:00
Bill Yi
2b605d89b9 Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev 
am: bd9caf4c6f

Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd
 2018-06-11 11:50:24 -07:00
Bill Yi
0c61c9baf6 [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4 
am: dafe5854dd  -s ours

Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0
 2018-06-11 11:48:00 -07:00
Bill Yi
6c409c2e99 [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793 -s ours 
am: b5af202209  -s ours

Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4
 2018-06-11 11:45:09 -07:00
Bill Yi
9ce893db7d Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev 
am: 5b882b9dd7

Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4
 2018-06-11 11:43:54 -07:00
Bill Yi
2e113959ff [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d 
am: d82564708f  -s ours

Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8
 2018-06-11 11:41:53 -07:00
Bill Yi
34d73a6f77 Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev 
am: 59f13cbb8a

Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8
 2018-06-11 11:37:03 -07:00
Bill Yi
b5af202209 [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 
am: 124cc34793  -s ours

Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b
 2018-06-11 11:35:00 -07:00
Bill Yi
927396047c [automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 am: 4228af93a7 -s ours 
am: fcd7cc11c7  -s ours

Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1
 2018-06-11 11:33:02 -07:00
Bill Yi
fcd7cc11c7 [automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 
am: 4228af93a7  -s ours

Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0
 2018-06-11 11:21:05 -07:00
TreeHugger Robot
c70d882667 Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58
  Import translations. DO NOT MERGE
 2018-06-11 18:19:38 +00:00
TreeHugger Robot
836d1db239 Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
  Import translations. DO NOT MERGE
 2018-06-11 18:11:29 +00:00
TreeHugger Robot
3bbe3c7c93 Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
  Import translations. DO NOT MERGE
 2018-06-11 18:06:41 +00:00
TreeHugger Robot
bd9caf4c6f Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
  Import translations. DO NOT MERGE
 2018-06-11 18:05:42 +00:00
TreeHugger Robot
5b882b9dd7 Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
  Import translations. DO NOT MERGE
 2018-06-11 18:03:31 +00:00
TreeHugger Robot
59f13cbb8a Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa
  Import translations. DO NOT MERGE
 2018-06-11 18:03:15 +00:00
Android Build Merger (Role)
4228af93a7 [automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295 
Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8
 2018-06-10 06:30:57 +00:00
Android Build Merger (Role)
091681e295 [automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 
Change-Id: Ic0e6aac64c5724221ca6fa3d75d0d0d463cfe9ab
 2018-06-10 06:30:51 +00:00
Bill Yi
faed2889f4 Import translations. DO NOT MERGE 
Change-Id: I9dcb973ffe7bab8894c863087532615f8c360806
Auto-generated-cl: translation import
 2018-06-09 23:30:29 -07:00
Android Build Merger (Role)
124cc34793 [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 
Change-Id: I7b5711eabd8f101cc5c268c2469a7f94582e4144
 2018-06-10 06:24:19 +00:00
Android Build Merger (Role)
4f7095b464 [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa 
Change-Id: I6e31b858c5da4119d4c331c2d568cb80e77711b5
 2018-06-10 06:24:12 +00:00