drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,506 Commits 1 Branch 0 Tags
Commit Graph

250506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladislav Kaznacheev
c1790befba Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev am: e06ef946f4 
am: 36ad144f6d

* commit '36ad144f6d28034edc1dd7e7f387c3ab432ce475':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I2ce8d4850d83f6bfb43862ad0638035cbe252f6c
 2016-05-04 17:17:21 +00:00
Vladislav Kaznacheev
36ad144f6d Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

* commit 'e06ef946f4f86e11f9a8ed5abe216ef7b76aebf0':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I34a53a199c2c8b133784af81c4b8d6a74da153c9
 2016-05-04 17:05:32 +00:00
TreeHugger Robot
e06ef946f4 Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 2016-05-04 16:41:08 +00:00
Baligh Uddin
8157506415 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5282bb5ee7 -s ours 
am: 7288db3f9d  -s ours

* commit '7288db3f9d27fe5b3d7d0bb9997475d5dbec8d7b':

Change-Id: I5cce51ade28d79a98476e63804f1d24afc810045
 2016-05-04 14:23:34 +00:00
Baligh Uddin
63a40dc393 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ce7d13e9e6 -s ours 
am: 2a68b23536  -s ours

* commit '2a68b23536e11c5a4b14c4c0b8f348c4c4963fa0':

Change-Id: I8b36c6fef3b37fb49765e5086296b6845604c5a4
 2016-05-04 14:23:31 +00:00
Baligh Uddin
a474353875 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2799ff8a4b -s ours 
am: 33563ebcbd  -s ours

* commit '33563ebcbdaad3d51efa44ea1b6e574d7a216ab8':

Change-Id: I56a6a4ff3046d3bde02397fb863a01104f1dade6
 2016-05-04 14:23:28 +00:00
Baligh Uddin
06a2c8065e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 151a7bb502 -s ours 
am: 0f820ba1a5  -s ours

* commit '0f820ba1a5dc8b4cef9d6777aa3cee8829890f4f':

Change-Id: I89056698c8dc9aee2bd7a33537dea62fc6aec79a
 2016-05-04 14:23:22 +00:00
Baligh Uddin
6129722c11 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5282bb5ee7 -s ours 
am: 13788ba7de  -s ours

* commit '13788ba7ded683fd5a7541d9e21702277fc02c58':
  Import translations. DO NOT MERGE

Change-Id: I3cf0161f5abc40d2d5d21e97c3e95b3b986ee050
 2016-05-04 14:14:49 +00:00
Baligh Uddin
47a56fdfbe Merge "Import translations. DO NOT MERGE" into nyc-dev am: ce7d13e9e6 -s ours 
am: 5fa6b666b4  -s ours

* commit '5fa6b666b4a9c359d51d973cd51bbd81a68d4677':
  Import translations. DO NOT MERGE

Change-Id: I4f45f01b57293627ad037af81e42b45b4614c1ad
 2016-05-04 14:14:46 +00:00
Baligh Uddin
4dcf9e60ec Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2799ff8a4b -s ours 
am: a1f6199fb9  -s ours

* commit 'a1f6199fb9ac99435ce3551d03d1c34c4a83dcf6':
  Import translations. DO NOT MERGE

Change-Id: I50f762e68b1789ee5196ba8b4cb5c20efd84dd54
 2016-05-04 14:14:42 +00:00
Baligh Uddin
b51508022d Merge "Import translations. DO NOT MERGE" into nyc-dev am: 151a7bb502 -s ours 
am: f437362f42  -s ours

* commit 'f437362f42bead10b6dc58fa95d69ed5a6bc8ff8':
  Import translations. DO NOT MERGE

Change-Id: I98a13b34187ab7b52b27b7df93ec133015b9acb0
 2016-05-04 14:14:36 +00:00
Baligh Uddin
7288db3f9d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 5282bb5ee7  -s ours

* commit '5282bb5ee71aa22cd9b943994e7af773730acbed':
  Import translations. DO NOT MERGE

Change-Id: I43066ee4166e2dc6c78d4e1b9454e6d7f4f8b5ee
 2016-05-04 14:04:26 +00:00
Baligh Uddin
2a68b23536 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ce7d13e9e6  -s ours

* commit 'ce7d13e9e69a886f3cd5117cc4060a38885b5d10':
  Import translations. DO NOT MERGE

Change-Id: Ief2d7d300f7057b63cf816bb98b781395a1f5587
 2016-05-04 14:04:22 +00:00
Baligh Uddin
33563ebcbd Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2799ff8a4b  -s ours

* commit '2799ff8a4b88a7f61978bc186259009915b42b29':
  Import translations. DO NOT MERGE

Change-Id: I0c64405e6fe1badc189341af2f505e3399596fa6
 2016-05-04 14:04:17 +00:00
Baligh Uddin
13788ba7de Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 5282bb5ee7  -s ours

* commit '5282bb5ee71aa22cd9b943994e7af773730acbed':
  Import translations. DO NOT MERGE

Change-Id: I724eef86f050bdd1f8ee9ba9ba1c8d2c302267c2
 2016-05-04 14:04:14 +00:00
Baligh Uddin
0f820ba1a5 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 151a7bb502  -s ours

* commit '151a7bb5020a46144d618a30624916eb58446517':
  Import translations. DO NOT MERGE

Change-Id: I08c5320d06b753cd0ab27617636cf9e9e167bea9
 2016-05-04 14:04:10 +00:00
Baligh Uddin
5fa6b666b4 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ce7d13e9e6  -s ours

* commit 'ce7d13e9e69a886f3cd5117cc4060a38885b5d10':
  Import translations. DO NOT MERGE

Change-Id: I4ca603cdefb3c97bc2544d0e36da7b39453cc2b5
 2016-05-04 14:04:10 +00:00
Baligh Uddin
a1f6199fb9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2799ff8a4b  -s ours

* commit '2799ff8a4b88a7f61978bc186259009915b42b29':
  Import translations. DO NOT MERGE

Change-Id: Iea3ea6f375f87f0879577155226a8cb4df9da844
 2016-05-04 14:04:06 +00:00
Baligh Uddin
f437362f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 151a7bb502  -s ours

* commit '151a7bb5020a46144d618a30624916eb58446517':
  Import translations. DO NOT MERGE

Change-Id: I62cd8e2442fd1ed650685eb1c230535982eb22a4
 2016-05-04 14:04:01 +00:00
Android Build Merger (Role)
75d2a38819 Merge "Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f am: e3f016fb4e" into nyc-mr1-dev-plus-aosp 2016-05-04 13:50:30 +00:00
Felipe Leme
576889bc61 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f 
am: e3f016fb4e

* commit 'e3f016fb4ec2cbb11ef875b04d334dff2ed306d2':

Change-Id: Id3f3dab5beefeb88ecb77fe037410662612df624
 2016-05-04 13:49:58 +00:00
Android Build Merger (Role)
47217c2762 Merge "Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f am: e3f016fb4e" into nyc-mr1-dev-plus-aosp 2016-05-04 13:46:31 +00:00
Felipe Leme
cb21662879 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f 
am: e3f016fb4e

* commit 'e3f016fb4ec2cbb11ef875b04d334dff2ed306d2':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: Ia69c06a7443622c52bca5f4ac62c21ae245c67e8
 2016-05-04 13:46:01 +00:00
Felipe Leme
78cf9fe068 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f 
am: 93d4e7b116

* commit '93d4e7b116c92dfcf90da5a8f78f6afa393f1e4f':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I902bc6bd23af517773331f2eb4731e9687ac3cb4
 2016-05-04 13:45:57 +00:00
Baligh Uddin
5282bb5ee7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:13 +00:00
Baligh Uddin
ce7d13e9e6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:09 +00:00
Baligh Uddin
2799ff8a4b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:31 +00:00
Baligh Uddin
151a7bb502 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:17 +00:00
Felipe Leme
93d4e7b116 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev 
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I841f4577ca6e0d2dfe5e3628ee281e92a33d260a
 2016-05-04 13:37:34 +00:00
Felipe Leme
e3f016fb4e Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev 
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I22204829f07d4f430d48b243f3db53c454c2d50e
 2016-05-04 13:37:29 +00:00
TreeHugger Robot
b5cc6af44f Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev 2016-05-04 13:24:13 +00:00
Android Build Merger (Role)
6aab57a690 Merge "Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d am: aea7696e20" into nyc-mr1-dev-plus-aosp 2016-05-04 13:03:42 +00:00
Tim Volodine
c23dff3dbd Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d 
am: aea7696e20

* commit 'aea7696e20f7936f7e4c32ea4f8546fc9d9483e5':

Change-Id: Ic46b54edfb7070d2e8dd4d6a7a1725213ec9733e
 2016-05-04 13:03:13 +00:00
Android Build Merger (Role)
9c8e7d765b Merge "Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d am: aea7696e20" into nyc-mr1-dev-plus-aosp 2016-05-04 13:00:05 +00:00
Tim Volodine
036b1a0a33 Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d 
am: aea7696e20

* commit 'aea7696e20f7936f7e4c32ea4f8546fc9d9483e5':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I14accac93a079f70eb146abe25bffd66aaad04d2
 2016-05-04 12:59:31 +00:00
Tim Volodine
0685396eac Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d 
am: 8e11bff55e

* commit '8e11bff55e6628cabb2ed16218f1f63fb6395a1d':
  [WebView] Update ServiceWorker related documentation.

Change-Id: Iddf73513a67a685cebc7321b9b315a909b3848f1
 2016-05-04 12:59:27 +00:00
Tim Volodine
8e11bff55e Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I88a8fdb21afead0c268754ba2b459eb75a2de90f
 2016-05-04 12:52:16 +00:00
Tim Volodine
aea7696e20 Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I81d317326997b1d550206fa6a0303bb98ef53e56
 2016-05-04 12:52:11 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Android Build Merger (Role)
47f161960b Merge "Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513e7 am: b79fedc929" into nyc-mr1-dev-plus-aosp 2016-05-04 11:12:09 +00:00
Ricky Wai
9bbfd86025 Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513e7 
am: b79fedc929

* commit 'b79fedc9294a22d3ecde0a8c3728a1c30c9730b9':

Change-Id: I4d81d44a3c0e6557665104c8f76f6666b24a40aa
 2016-05-04 11:11:33 +00:00
Android Build Merger (Role)
99b3b0d257 Merge "Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513e7 am: b79fedc929" into nyc-mr1-dev-plus-aosp 2016-05-04 11:06:33 +00:00
Ricky Wai
04438534e4 Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513e7 
am: b79fedc929

* commit 'b79fedc9294a22d3ecde0a8c3728a1c30c9730b9':
  Do not show exception stack trace when no child profile key

Change-Id: I926e9e85ea47ce4a31ab1451532e4b3d9254aab1
 2016-05-04 11:06:09 +00:00
Ricky Wai
c3bb85d9c2 Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513e7 
am: 4566c8c1d1

* commit '4566c8c1d1964bee2a106f3c4fdf35c2b3858df7':
  Do not show exception stack trace when no child profile key

Change-Id: I17235b63bfc42fb497d9879461043ee92a34d298
 2016-05-04 11:06:03 +00:00
Ricky Wai
4566c8c1d1 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 
am: 3423a513e7

* commit '3423a513e7c0c0a0a7ae0fada1fc684c990c0aa2':
  Do not show exception stack trace when no child profile key

Change-Id: I394a3dfd8c4eeae20e2c7e0c5a9228e1be14ca48
 2016-05-04 10:59:57 +00:00
Ricky Wai
b79fedc929 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 
am: 3423a513e7

* commit '3423a513e7c0c0a0a7ae0fada1fc684c990c0aa2':
  Do not show exception stack trace when no child profile key

Change-Id: I0ef58126daa4ed3ea3e683aecda677c21ee00786
 2016-05-04 10:59:49 +00:00
Ricky Wai
3423a513e7 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 2016-05-04 10:47:55 +00:00
Ricky Wai
5211c7dfc0 Merge "Make notification reply can response to work challenge" into nyc-dev am: 92d0e9a4ed 
am: 5a76ee9cd5

* commit '5a76ee9cd573517a3d1f7c51756bd320888e7c0f':

Change-Id: I34cb8657878d92d4ef067b6b542b53e0c9c56ed0
 2016-05-04 10:47:01 +00:00
Tony Mak
416a2f0880 New settings key and policy transparency for managed profile settings am: c820cc5fb1 
am: 012d7426c2

* commit '012d7426c2dfb82cf69102e33ea5aba571976ee1':

Change-Id: I1d9933fed3a43e16cfe42019b0bac7a5f8c9e017
 2016-05-04 10:46:55 +00:00
Ricky Wai
5a76ee9cd5 Merge "Make notification reply can response to work challenge" into nyc-dev 
am: 92d0e9a4ed

* commit '92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
  Make notification reply can response to work challenge

Change-Id: Ie684a58e8598bcaf9763d282f7624ce81817d6d8
 2016-05-04 10:41:38 +00:00