Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2bba2ebd09 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours 
am: f35dcdb530  -s ours

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

Change-Id: Ifa2c8f7ff76137c9cafd4cedeb2b684f2be22ebe
 2016-05-31 05:00:13 +00:00
Bill Yi
3b67ce333a Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours am: f3dfa54f79 -s ours 
am: abb5a753cf  -s ours

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

Change-Id: I647cabe57ed712473765755305005d7b911e1f93
 2016-05-31 04:55:03 +00:00
Bill Yi
b07381c854 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours am: e53394400c -s ours 
am: 93f95cad0c  -s ours

* commit '93f95cad0c50e5fa7825ea7d0a6f94af6f85dfcd':
  Import translations. DO NOT MERGE

Change-Id: Idef217e7feb141ed66b6f08372514463eefa13c3
 2016-05-31 04:54:47 +00:00
Bill Yi
8072b2cf9b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6d160e9b8d -s ours 
am: 5424a1be12  -s ours

* commit '5424a1be12c13087e4ceffd39d66254e06c2436e':
  Import translations. DO NOT MERGE

Change-Id: Idfcd9e4d516ac5fb7a6ed2491eb1548da0b0fefa
 2016-05-31 04:54:34 +00:00
Bill Yi
fc22bd87ff Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e71cdef7e3  -s ours

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

Change-Id: I2180ff991e0f2a3969dc13b44931a9cf6a639f24
 2016-05-31 04:50:22 +00:00
Bill Yi
4f6969c7eb Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ae284e6cb6  -s ours

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

Change-Id: Ib50a2d6669eec4e8c2185d056712700f0ebd5d21
 2016-05-31 04:50:16 +00:00
Bill Yi
3551359739 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 5854f2aa07  -s ours

* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
  Import translations. DO NOT MERGE

Change-Id: I8e1a06a15432d0599f86bba7c42d7e9d1f2fcd38
 2016-05-31 04:50:12 +00:00
Roozbeh Pournader
08b6d01ccb Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: I98301daa256ab8e8dc2dc05c1e877f39ef685c23
 2016-05-31 04:49:59 +00:00
Bill Yi
abb5a753cf Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours 
am: f3dfa54f79  -s ours

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

Change-Id: I6a83cc15114c3e7c37980f74bcad0b69eb233b3f
 2016-05-31 04:49:39 +00:00
Bill Yi
93f95cad0c Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours 
am: e53394400c  -s ours

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

Change-Id: I6e589440817760fb646979e95fd3404ae31b98a1
 2016-05-31 04:49:35 +00:00
Bill Yi
5424a1be12 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 6d160e9b8d  -s ours

* commit '6d160e9b8d260c1609e6df05215a6b6300ae6fe9':
  Import translations. DO NOT MERGE

Change-Id: I903b1bca7bb9fa9f8ffd34a70292bc94ab6d591c
 2016-05-31 04:49:29 +00:00
Bill Yi
f35dcdb530 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e71cdef7e3  -s ours

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

Change-Id: I17af720d1549bc29d2f8a823d529d2d9429671ee
 2016-05-31 04:48:25 +00:00
Bill Yi
9bd9985451 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 52364d9fc4 -s ours 
am: 0a2900a526  -s ours

* commit '0a2900a5265bdd9b8535d845488fb7ec3e419f3a':
  Import translations. DO NOT MERGE

Change-Id: I62a29dfc789075823751fcc4a16795ef27b6ea1f
 2016-05-31 04:25:18 +00:00
Bill Yi
f3dfa54f79 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ae284e6cb6  -s ours

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

Change-Id: I65d0bb4ce8a10499a43e5935ccffca9bdcf42d0a
 2016-05-31 04:06:21 +00:00
Bill Yi
e53394400c Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 5854f2aa07  -s ours

* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
  Import translations. DO NOT MERGE

Change-Id: I565899541685a2f1951c35d8a07b4f29ca5eae3e
 2016-05-31 04:06:13 +00:00
Bill Yi
0a2900a526 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 52364d9fc4  -s ours

* commit '52364d9fc45730e98f2aba65cc084209e4debce5':
  Import translations. DO NOT MERGE

Change-Id: I2ebfc7714631b4cbfaa16b9641c15a46eb15a8a7
 2016-05-31 04:06:10 +00:00
TreeHugger Robot
3f18c7a879 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:55:00 +00:00
TreeHugger Robot
e71cdef7e3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:54:31 +00:00
TreeHugger Robot
6d160e9b8d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-31 03:53:25 +00:00
TreeHugger Robot
2135c779c3 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:51:14 +00:00
TreeHugger Robot
164c4e4af3 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:50:57 +00:00
TreeHugger Robot
be151aeff9 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:50:39 +00:00
TreeHugger Robot
ac126e3bb5 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:50:23 +00:00
TreeHugger Robot
d7c9fa1b35 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:50:16 +00:00
TreeHugger Robot
18898f448c Merge "Import translations. DO NOT MERGE" 2016-05-31 03:49:34 +00:00
TreeHugger Robot
ae284e6cb6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:46:00 +00:00
TreeHugger Robot
5854f2aa07 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:45:44 +00:00
TreeHugger Robot
52364d9fc4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-31 03:42:45 +00:00
Roozbeh Pournader
a0b920f4da Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 5f55e2c43d 
am: bbed32a63b

* commit 'bbed32a63b420126850767ae5cf2484bea11c1d4':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Ibead4334a7797320d6ae7c5792482416b4a7e2d0
 2016-05-31 01:32:39 +00:00
Roozbeh Pournader
bbed32a63b Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 
am: 5f55e2c43d

* commit '5f55e2c43d8fa1f8b494a5457106435b519bb8c4':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Icadb45317257e80e97c4dad6970310f64abb1f0b
 2016-05-31 01:26:35 +00:00
Roozbeh Pournader
5f55e2c43d Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Ifc5d3f3b43bef256141db089d5783427561e4dae
 2016-05-31 01:20:44 +00:00
Bill Yi
5248b0cb75 Import translations. DO NOT MERGE 
Change-Id: I2bc1e221db4776d03f49e80844a482628e632262
Auto-generated-cl: translation import
 2016-05-30 18:16:13 -07:00
Bill Yi
f03166100c Import translations. DO NOT MERGE 
Change-Id: I55d645f1ec4661ef1db9a650aa555178fc6ed6a5
Auto-generated-cl: translation import
 2016-05-30 18:11:25 -07:00
Roozbeh Pournader
fe524c0e24 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 2016-05-31 01:02:42 +00:00
Bill Yi
95c8a941af Import translations. DO NOT MERGE 
Change-Id: Ieeea0ff0eefd470b6a929f69671ca10724990c88
Auto-generated-cl: translation import
 2016-05-30 17:49:58 -07:00
Bill Yi
c235d8cd09 Import translations. DO NOT MERGE 
Change-Id: Ibf3e43dba2b11634207c5e1e139133235dbb1227
Auto-generated-cl: translation import
 2016-05-30 16:51:14 -07:00
Bill Yi
cc1c4c6529 Import translations. DO NOT MERGE 
Change-Id: I752aaf3a1f92c1af99862e1ddbbbf57953d8713f
Auto-generated-cl: translation import
 2016-05-30 16:27:24 -07:00
Bill Yi
5f26f4e009 Import translations. DO NOT MERGE 
Change-Id: I7428485dee787e42954b5d7a424c6d6cdfa5b62f
Auto-generated-cl: translation import
 2016-05-30 16:24:55 -07:00
Bill Yi
b4e7af89ba Import translations. DO NOT MERGE 
Change-Id: I696083fb05e48caa59c5184654f40cd52e5e441b
Auto-generated-cl: translation import
 2016-05-30 16:12:15 -07:00
Bill Yi
e7331805cc Import translations. DO NOT MERGE 
Change-Id: Ic1b2b9bae378715bef768aa1e5a95a8623737328
Auto-generated-cl: translation import
 2016-05-30 16:03:16 -07:00
Bill Yi
a2ba197df4 Import translations. DO NOT MERGE 
Change-Id: Icb8d39b0d2590f3454fd0fc62ece6cc2c522c878
Auto-generated-cl: translation import
 2016-05-30 16:00:47 -07:00
Bill Yi
f5fcd787d2 Import translations. DO NOT MERGE 
Change-Id: Ie8c966447c73755f887ffde0f039f5dcbecfa809
Auto-generated-cl: translation import
 2016-05-30 11:59:18 -07:00
Bill Yi
650a11a2dd Import translations. DO NOT MERGE 
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
 2016-05-30 11:53:22 -07:00
Bill Yi
5bf7c35034 Import translations. DO NOT MERGE 
Change-Id: Ie8e475d75eb14dd8f08a7ffe6bcfb8ef2d2ee3f6
Auto-generated-cl: translation import
 2016-05-30 10:54:54 -07:00
Victor Chang
98a633a89c Fix VPN Request dialog appearing each time VPN is connecting 
cause: ConfirmDialog is shown when prepareVpn(package, null)
returns false when the package is in always-on mode

We added the code in ag/949136 to stop app replacing app currently set to always-on.

Bug: 28941235
Change-Id: I370e56ad59332cc3fb722a98730fa73a97e26831
 2016-05-30 18:35:08 +01:00
Greg Hackmann
f1dd96694f Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b am: 359a4d9569 am: f11d0fe8c5 
am: ff8c648dda

* commit 'ff8c648dda79ea2ee10f0fd1860d149f31583808':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I7537dbde085982898899f1300a94062eb54d2ac6
 2016-05-28 16:55:02 +00:00
Greg Hackmann
ff8c648dda Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b am: 359a4d9569 
am: f11d0fe8c5

* commit 'f11d0fe8c5a0906a7b6295adea9da1d544a3a22d':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I59c0d3b1e08ed98fa8d2e4e1c3ff4992d3088814
 2016-05-28 16:47:44 +00:00
Greg Hackmann
f11d0fe8c5 Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b 
am: 359a4d9569

* commit '359a4d9569fd88a896650065256e8a377546b8e2':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I0f1ed806b1261796da0dad770c50e8e1b9f5b3e1
 2016-05-28 16:41:13 +00:00
Greg Hackmann
359a4d9569 Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" 
am: 6fb921a61b

* commit '6fb921a61b0ca6bac8002e0fdbeb521453dce408':
  Revert "AlarmManagerService: remove legacy /dev/alarm support"

Change-Id: I7cfaa210c181c9f3754727797609d3ed4ce3244e
 2016-05-28 16:34:39 +00:00
Treehugger Robot
6fb921a61b Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" 2016-05-28 16:19:03 +00:00