Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
329,563 Commits 3 Branches 0 Tags
bf7981bf90134f648b80cf155f7ecd02b4430435
Commit Graph

329563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bf7981bf90 Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev 
am: b59324afa1

Change-Id: I34809b7775652fa23e145a73647b67292f41f10e
 2018-03-03 07:03:23 +00:00
Bill Yi
7d05ce8473 [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad 
am: 551e9b00ee  -s ours

Change-Id: I482f064fca94761b7d01597177d7642629cf1553
 2018-03-03 07:01:41 +00:00
Bill Yi
bad5ea4cb1 Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev 
am: 3850cf69e3

Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143
 2018-03-03 06:51:28 +00:00
Bill Yi
1f6fdce0b0 [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 
am: ac782db7b2  -s ours

Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61
 2018-03-03 06:49:53 +00:00
Bill Yi
3d82e195f7 [automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 
am: fa863f597e  -s ours

Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd
 2018-03-03 06:37:52 +00:00
TreeHugger Robot
b59324afa1 Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905
  Import translations. DO NOT MERGE
 2018-03-03 05:28:03 +00:00
TreeHugger Robot
3850cf69e3 Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6
  Import translations. DO NOT MERGE
 2018-03-03 05:27:27 +00:00
Android Build Merger (Role)
fa863f597e [automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 
Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b
 2018-03-03 00:44:08 +00:00
Android Build Merger (Role)
c400b6da60 [automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 
Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460
 2018-03-03 00:44:01 +00:00
Bill Yi
52ebdfd973 Import translations. DO NOT MERGE 
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
 2018-03-02 16:43:41 -08:00
Android Build Merger (Role)
ac782db7b2 [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 
Change-Id: Icea7f683d6428ed86d7446071fd85547127ee9dc
 2018-03-02 23:39:54 +00:00
Android Build Merger (Role)
9c8f34f724 [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 
Change-Id: Ic29200b8737f5718d33791faa5f7f12f3eeb9d76
 2018-03-02 23:39:48 +00:00
Bill Yi
73534775a6 Import translations. DO NOT MERGE 
Change-Id: I823f9d64c30c157bd876f95c1f99ffddb0d88a4c
Auto-generated-cl: translation import
 2018-03-02 15:39:30 -08:00
Android Build Merger (Role)
551e9b00ee [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad 
Change-Id: I3eabd9c7e638ba1b860759c07fb27360a91d8ab3
 2018-03-02 22:40:22 +00:00
Android Build Merger (Role)
2a68a8d9ad [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 
Change-Id: I6b298dd7d2c471c2ec860b0760b97fd06a360d81
 2018-03-02 22:40:15 +00:00
Bill Yi
5d8bb93905 Import translations. DO NOT MERGE 
Change-Id: If21d03f82c2a5eafaec39ecf54f05ed51fdacde6
Auto-generated-cl: translation import
 2018-03-02 14:39:55 -08:00
Bill Yi
ff1a55a207 Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev 
am: a1f536e00e

Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058
 2018-02-20 05:09:31 +00:00
Bill Yi
6f40fc77e6 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 
am: 7b73069b0a  -s ours

Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf
 2018-02-20 05:08:15 +00:00
Bill Yi
ea5b2a818d Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev 
am: dd05e2d932

Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6
 2018-02-20 05:02:56 +00:00
Bill Yi
16e78b6dc1 [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc 
am: 023ae30cdd  -s ours

Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e
 2018-02-20 05:01:34 +00:00
Bill Yi
da0d89bf92 [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 
am: 42e8a0c2de  -s ours

Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28
 2018-02-20 04:56:46 +00: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
Siyamed Sinir
bb0a801a85 [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 
am: 1fd506a340

Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
 2018-02-15 00:31:11 +00: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
Etan Cohen
84f311b805 [automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df 
am: ad8bae1b73

Change-Id: I8f4db5b6b97eca28404de8fc990c18f9a8f50575
 2018-02-08 09:06:07 +00:00
Etan Cohen
bd7573db8f [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 
am: d1e93e361c

Change-Id: Ice0a36135954e952b307b7ee909ec4add3c5d6ee
 2018-02-08 08:45:32 +00:00
Etan Cohen
7c2ccdd777 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 
am: bc7bb6c274

Change-Id: I1f8ded34983a29bde17ffd1927a11fb67becb38e
 2018-02-08 08:25:53 +00:00
Etan Cohen
655059b334 Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev 
am: d0adbcb4e2

Change-Id: I287c62a8b83662ba112809ce2aa07c5a3f04fb6d
 2018-02-08 08:07:30 +00:00