Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318,466 Commits 3 Branches 0 Tags
4cd38db343c72930c7e37b18d76c5e36fe800177
Commit Graph

318466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
4cd38db343 [automerger skipped] Import translations. DO NOT MERGE skipped: dfffd1a532 skipped: b8f08e00fd 
Change-Id: I5115053a7f801215fea81c8f23bbb275aab0e0fd
 2018-03-02 23:02:09 +00:00
Android Build Merger (Role)
b8f08e00fd [automerger skipped] Import translations. DO NOT MERGE skipped: dfffd1a532 
Change-Id: Id9175caf6dec27c84c1046d0f972ff82d56248a7
 2018-03-02 23:02:04 +00:00
Bill Yi
dfffd1a532 Import translations. DO NOT MERGE 
Change-Id: Icece121527012851ebbde0a78216acd34f7061aa
Auto-generated-cl: translation import
 2018-03-02 15:01:39 -08:00
TreeHugger Robot
a1f536e00e Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2
  Import translations. DO NOT MERGE
 2018-02-20 04:54:20 +00:00
TreeHugger Robot
26545cdd29 Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into nyc-mr2-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2
  Import translations. DO NOT MERGE
 2018-02-20 04:54:20 +00:00
TreeHugger Robot
87b0f9add8 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-02-20 04:54:20 +00:00
TreeHugger Robot
dd05e2d932 Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd
  Import translations. DO NOT MERGE
 2018-02-20 04:53:51 +00:00
TreeHugger Robot
84a22e7bc5 Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into nyc-mr2-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd
  Import translations. DO NOT MERGE
 2018-02-20 04:53:51 +00:00
TreeHugger Robot
8e7e1e874f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-02-20 04:53:51 +00:00
Android Build Merger (Role)
023ae30cdd [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc 
Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4
 2018-02-19 17:17:18 +00:00
Android Build Merger (Role)
0b7e5c37cc [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd 
Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19
 2018-02-19 17:17:12 +00:00
Bill Yi
fb5d1738dd Import translations. DO NOT MERGE 
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
 2018-02-19 09:16:47 -08:00
Android Build Merger (Role)
42e8a0c2de [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 
Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867
 2018-02-19 16:08:26 +00:00
Android Build Merger (Role)
baff683653 [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 
Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14
 2018-02-19 16:08:19 +00:00
Bill Yi
a4513689c8 Import translations. DO NOT MERGE 
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
 2018-02-19 08:07:44 -08:00
Android Build Merger (Role)
7b73069b0a [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 
Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397
 2018-02-19 15:09:11 +00:00
Android Build Merger (Role)
2aaa34b639 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 
Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530
 2018-02-19 15:09:03 +00:00
Bill Yi
4c87ffeae2 Import translations. DO NOT MERGE 
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
 2018-02-19 07:08:29 -08:00
Android Build Merger (Role)
1fd506a340 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 skipped: aa9c801f89 
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
 2018-02-15 00:06:21 +00:00
Android Build Merger (Role)
aa9c801f89 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
 2018-02-15 00:06:16 +00:00
Android Build Merger (Role)
7db4a90e60 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f 
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
 2018-02-15 00:06:11 +00:00
Android Build Merger (Role)
fc98290b1f [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
 2018-02-15 00:06:07 +00:00
Android Build Merger (Role)
d57766c5b4 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
 2018-02-15 00:06:02 +00:00
Android Build Merger (Role)
0a2ed3f761 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
 2018-02-15 00:05:54 +00:00
Android Build Merger (Role)
15a3e59d35 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
 2018-02-15 00:05:49 +00:00
Android Build Merger (Role)
85727109f0 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a 
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
 2018-02-15 00:05:43 +00:00
Android Build Merger (Role)
30a705874a [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
 2018-02-15 00:05:38 +00:00
Android Build Merger (Role)
ad8bae1b73 [automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df 
Change-Id: Iad2f6bbb0783083c5e5a3845843b6ac92b1560d8
 2018-02-08 01:07:32 +00:00
Etan Cohen
5a590c68df Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev 
am: 9e5c21243c

Change-Id: Iff594c5c0a8e258528d6c0a8399a2df057f90633
 2018-02-08 01:06:47 +00:00
Android Build Merger (Role)
9e5c21243c Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev 2018-02-08 00:27:17 +00:00
Android Build Merger (Role)
d1e93e361c [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 
Change-Id: Ie81fae7db0592bbe435f2809aa0d93b58e581e06
 2018-02-08 00:26:40 +00:00
Android Build Merger (Role)
3979121a99 [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 
Change-Id: I83429de2ddef2fe856fb40035204791aa66796f8
 2018-02-08 00:26:34 +00:00
Etan Cohen
1aab54a3a3 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev 
am: 50d4e94767

Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e
 2018-02-08 00:26:07 +00:00
Android Build Merger (Role)
bc7bb6c274 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 
Change-Id: I6463a678c01ec630fb348fa6661beb681078fe4c
 2018-02-08 00:16:53 +00:00
Android Build Merger (Role)
d2428ebae4 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e 
Change-Id: If54c2a5deeede4eb51b48c18365229928e3db763
 2018-02-08 00:16:48 +00:00
Android Build Merger (Role)
0c8b40873e [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a 
Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1
 2018-02-08 00:16:33 +00:00
Android Build Merger (Role)
363b273e9a [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 
Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b
 2018-02-08 00:16:09 +00:00
Etan Cohen
cdc187ee10 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev 
am: fa72a625cc

Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c
 2018-02-08 00:15:28 +00:00
Android Build Merger (Role)
d0adbcb4e2 Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev 2018-02-08 00:15:26 +00:00
Etan Cohen
f52e68c417 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev 
am: 39e6bc7495

Change-Id: I9bce38d411fa55aed455a3de2dba9d16cca4db6d
 2018-02-08 00:14:51 +00:00
Android Build Merger (Role)
5c777fbcef [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b 
Change-Id: Ia78647742f44c9dc51d030d984b0dc9332139044
 2018-02-08 00:07:43 +00:00
Android Build Merger (Role)
7f4440640b [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d 
Change-Id: Iafbde79d1e7d4342b305726fd7b6e58984d98972
 2018-02-08 00:07:36 +00:00
Etan Cohen
1d10387f0d Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev 
am: bd629f69ed

Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338
 2018-02-08 00:07:01 +00:00
Android Build Merger (Role)
8e5ec12799 Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev 
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058
 2018-02-07 23:50:21 +00:00
Android Build Merger (Role)
f9d12ab718 Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into nyc-mr2-dev 
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058
 2018-02-07 23:50:21 +00:00
Android Build Merger (Role)
c8c1b5162f Merge "Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058" into cw-f-dev 2018-02-07 23:50:21 +00:00
Android Build Merger (Role)
358bf6c4f9 Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f" into nyc-mr1-dev 2018-02-07 23:49:05 +00:00
Android Build Merger (Role)
39e6bc7495 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev 
* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f
 2018-02-07 23:49:05 +00:00
Android Build Merger (Role)
124da97327 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev 
* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f
 2018-02-07 23:49:05 +00:00
Android Build Merger (Role)
50be3c757e [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7 
Change-Id: I01f6d3b238bc1da87df6f6d46ae79cd1d679c72a
 2018-02-07 23:48:28 +00:00