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

114336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8ff7fa4836 am bf99468a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'bf99468ae8dadd8b933e64c3fc35f7475395d74f':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:38 -07:00
Baligh Uddin
7b6cdc5d8d am f343fbd8: (-s ours) am af0c8bfb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f343fbd82a1be8df45afb91bd8c9af7ea736c0ed':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:28 -07:00
Robert Greenwalt
72566b98db am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit '1c6fdd6c7b58b7f25d49fd26a29a03a478cc5937':
  Revert "Use a build-specific wifi country code"
 2013-10-04 13:34:22 -07:00
Baligh Uddin
6394e1e0d9 am ba78a70c: (-s ours) am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ba78a70c1d3bb5d135d3233d5479f41ed7183b0b':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:19 -07:00
Baligh Uddin
783b4c7c44 am 626bbd23: (-s ours) am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '626bbd23cf3476af5b52779504a41f36cfc0026b':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:13 -07:00
Baligh Uddin
338cb79cbc am e5449a3b: (-s ours) am eba7c748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e5449a3b44de1b0245ecf7edd4989b5bef005493':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:11 -07:00
Robert Greenwalt
1db7024c50 am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo
 2013-10-04 13:34:08 -07:00
Robert Greenwalt
aabe1bf306 am 32c9cd84: am 0fb5a4d8: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev 
* commit '32c9cd84034512f54fe05c66fd73279c8f1ca596':
  Don't redirect dns to an iface without dns servers
 2013-10-04 13:34:05 -07:00
Baligh Uddin
dfbe5bdba8 am 1ce9c5a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '1ce9c5a6af3de61516229b861c9d7f5e1ecf93eb':
  Import translations. DO NOT MERGE
 2013-10-04 13:33:57 -07:00
Baligh Uddin
b2792bf7c8 am cab5c5c3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'cab5c5c3eb72a05b6cb7fd55972c269e1cbf1e23':
  Import translations. DO NOT MERGE
 2013-10-04 13:33:54 -07:00
Baligh Uddin
12b8720e4f am e74a4c7c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e74a4c7cdc60c7690c6894ce26c6d3b8a737ac08':
  Import translations. DO NOT MERGE
 2013-10-04 13:33:51 -07:00
Baligh Uddin
bf99468ae8 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 19:22:07 +00:00
Baligh Uddin
f343fbd82a am af0c8bfb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'af0c8bfbc5baf6a96de66e11cb2041c8fefe7cc5':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:43 -07:00
Robert Greenwalt
1c6fdd6c7b am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit 'cac2fd302e844a4a46bb1749a2d2ed4739b4dc53':
  Revert "Use a build-specific wifi country code"
 2013-10-04 12:02:39 -07:00
Baligh Uddin
ba78a70c1d am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '548622a26ac758f72eb0dbb16cd83aa5d51f2b2b':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:36 -07:00
Baligh Uddin
626bbd23cf am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5b40f4fcac425fdc4c031dee5fb67c5f44fde968':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:34 -07:00
Baligh Uddin
e5449a3b44 am eba7c748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eba7c74871a71e0efec56aad779cc06c36391ed9':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:31 -07:00
Robert Greenwalt
2e23484eec am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit 'f3f1a3709306454c0ca562e2c7262d4889dd0071':
  Un-deprecate getDhcpInfo
 2013-10-04 12:02:29 -07:00
Robert Greenwalt
32c9cd8403 am 0fb5a4d8: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev 
* commit '0fb5a4d8ca5e0f6aaf3db9dddfcc3a61a106c545':
  Don't redirect dns to an iface without dns servers
 2013-10-04 12:02:25 -07:00
Baligh Uddin
9b339da81a Import translations. DO NOT MERGE 
Change-Id: I68ed642abdc92dfc1fbdf66576fe488d8a36e213
Auto-generated-cl: translation import
 2013-10-04 11:59:23 -07:00
Baligh Uddin
af0c8bfbc5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:48:44 +00:00
Baligh Uddin
6d4aa52733 Import translations. DO NOT MERGE 
Change-Id: I927e06ba5d3e63e0744fac3faa82061dcf2c518d
Auto-generated-cl: translation import
 2013-10-04 11:35:25 -07:00
Robert Greenwalt
cac2fd302e Merge "Revert "Use a build-specific wifi country code"" into klp-dev 2013-10-04 18:33:51 +00:00
Baligh Uddin
1ce9c5a6af Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 18:13:24 +00:00
Baligh Uddin
548622a26a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:13:19 +00:00
Baligh Uddin
cab5c5c3eb Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 18:13:08 +00:00
Baligh Uddin
5b40f4fcac Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:13:03 +00:00
Baligh Uddin
e74a4c7cdc Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 18:12:50 +00:00
Baligh Uddin
eba7c74871 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:12:44 +00:00
Baligh Uddin
054813e881 Import translations. DO NOT MERGE 
Change-Id: I84ed52b8fa9c8f3e4a22f5b972bf719cc8a5ae1b
Auto-generated-cl: translation import
 2013-10-04 11:10:39 -07:00
Baligh Uddin
c170c22cc0 Import translations. DO NOT MERGE 
Change-Id: I1227decae162536bf90ffb753308cb4018e0538e
Auto-generated-cl: translation import
 2013-10-04 11:08:41 -07:00
Robert Greenwalt
f3f1a37093 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
0fb5a4d8ca Merge "Don't redirect dns to an iface without dns servers" into klp-dev 2013-10-04 18:06:13 +00:00
Baligh Uddin
fd2c7d10a5 Import translations. DO NOT MERGE 
Change-Id: I161f98685fc14784a937b2df20da1b2480dc9434
Auto-generated-cl: translation import
 2013-10-04 11:06:12 -07:00
Baligh Uddin
fb60905c65 Import translations. DO NOT MERGE 
Change-Id: I0774c814f839f7a06aaa3cb023782e8eb0adf305
Auto-generated-cl: translation import
 2013-10-04 11:05:28 -07:00
Baligh Uddin
e21e8cfca2 Import translations. DO NOT MERGE 
Change-Id: Ib4c73d8383110d55f2bec06058b7f8d9a01d05ce
Auto-generated-cl: translation import
 2013-10-04 11:03:39 -07:00
Baligh Uddin
3eb6b8d626 Import translations. DO NOT MERGE 
Change-Id: Id91951dbb1084dd04fd93aa1cd26b6b558ff33ef
Auto-generated-cl: translation import
 2013-10-04 11:02:34 -07:00
Dianne Hackborn
4ad5e888d4 am 0f92dde3: am ae7b22d6: Merge "Fix issue #10901205: Shouldn\'t send broadcasts (or try to bind services, etc.)..." into klp-dev 
* commit '0f92dde36f1f68c246e49943445676ce21a339c8':
  Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)...
 2013-10-04 10:55:58 -07:00
Dianne Hackborn
0f92dde36f am ae7b22d6: Merge "Fix issue #10901205: Shouldn\'t send broadcasts (or try to bind services, etc.)..." into klp-dev 
* commit 'ae7b22d61df0aef471c50d56a06a7d4316daffc6':
  Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)...
 2013-10-04 10:52:41 -07:00
Dianne Hackborn
ae7b22d61d Merge "Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)..." into klp-dev 2013-10-04 17:47:34 +00:00
Robert Greenwalt
cb2fe96f2c Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
 2013-10-04 09:53:39 -07:00
Svetoslav Ganov
57f1c60f41 am 2658f35a: am 6bf10299: Merge "Deleting print job files when we do not have to." into klp-dev 
* commit '2658f35a5e58c65b9d5ff063f16a22dae4472669':
  Deleting print job files when we do not have to.
 2013-10-04 09:53:16 -07:00
Dianne Hackborn
1062559d43 am 2d91368a: am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 
* commit '2d91368aea75dbc195d07efc465a462a006a5753':
  Fix issue #11069176: Crash showing process stats
 2013-10-04 09:53:14 -07:00
Svetoslav Ganov
2658f35a5e am 6bf10299: Merge "Deleting print job files when we do not have to." into klp-dev 
* commit '6bf1029900d09d0432fb82f8c076bdb3eefc1f6c':
  Deleting print job files when we do not have to.
 2013-10-04 09:51:40 -07:00
Dianne Hackborn
2d91368aea am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 
* commit '2d94c57345ba3e837ef780de9dae172c3abd5ae8':
  Fix issue #11069176: Crash showing process stats
 2013-10-04 09:51:38 -07:00
Svetoslav Ganov
6bf1029900 Merge "Deleting print job files when we do not have to." into klp-dev 2013-10-04 16:50:53 +00:00
Dianne Hackborn
2d94c57345 Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 2013-10-04 16:49:05 +00:00
Svetoslav
6077037abf am 2f6aabd7: am 5c126892: Merge "Print UI tweaks as per UX request." into klp-dev 
* commit '2f6aabd7c399377e4ea033e5882b71420737017c':
  Print UI tweaks as per UX request.
 2013-10-04 09:03:23 -07:00
Svetoslav
2f6aabd7c3 am 5c126892: Merge "Print UI tweaks as per UX request." into klp-dev 
* commit '5c126892ec53772d784fcf9cef9165acf1d92ce3':
  Print UI tweaks as per UX request.
 2013-10-04 09:00:52 -07:00
Svetoslav
5c126892ec Merge "Print UI tweaks as per UX request." into klp-dev 2013-10-04 15:58:10 +00:00