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

107536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d7a383238f am ba82b53d: (-s ours) am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'ba82b53dd7896fcc28af24f6625818a7d7afc5e4':
  Import translations. DO NOT MERGE
 2013-06-03 14:18:25 -07:00
Baligh Uddin
08afe497be Merge "Import translations. DO NOT MERGE" 2013-06-03 21:17:51 +00:00
Baligh Uddin
ba82b53dd7 am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '26fe0761e3e275347c06f9224e24ab7a31ff23e8':
  Import translations. DO NOT MERGE
 2013-06-03 14:15:52 -07:00
Baligh Uddin
85de5f420e Merge "Import translations. DO NOT MERGE" 2013-06-03 21:15:14 +00:00
Baligh Uddin
26fe0761e3 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-03 21:14:23 +00:00
The Android Open Source Project
e382d4da24 am 5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '5871434ed6cb00895bba1bc253dcbfc49c453041':
 2013-06-03 14:07:19 -07:00
The Android Open Source Project
5871434ed6 Reconcile with jb-mr2-release - do not merge 
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
 2013-06-03 14:02:50 -07:00
Scott Main
c930c4e1f0 am dce21a59: am 3c080baa: am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit 'dce21a59d9793551abd08ad852714894a1b0d19d':
  update dashbord for 6/3
 2013-06-03 11:37:27 -07:00
Scott Main
dce21a59d9 am 3c080baa: am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '3c080baad5609faa663238f202c7aae7268bbd2c':
  update dashbord for 6/3
 2013-06-03 11:35:02 -07:00
Scott Main
3c080baad5 am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '564889b1263bb1c5cfcd21401f853b0cc1569a50':
  update dashbord for 6/3
 2013-06-03 11:33:13 -07:00
Scott Main
564889b126 am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4a024be4de71f90eaaff7be8122926bdc9297d38':
  update dashbord for 6/3
 2013-06-03 11:17:15 -07:00
Scott Main
4a024be4de am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4cef8150c83ce60a4d3acc495132357fb9bd1458':
  update dashbord for 6/3
 2013-06-03 11:15:16 -07:00
Scott Main
4cef8150c8 Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 2013-06-03 18:12:54 +00:00
Baligh Uddin
179cffe5a0 Import translations. DO NOT MERGE 
Change-Id: Ia370f49ef3fbc9e163b0db22181ba8ad68caef05
Auto-generated-cl: translation import
 2013-06-03 09:45:51 -07:00
Baligh Uddin
c15f410d97 Import translations. DO NOT MERGE 
Change-Id: I973aa572426edfe9ebb11e30133d7baef5c98384
Auto-generated-cl: translation import
 2013-06-03 09:25:54 -07:00
Baligh Uddin
87b2098a8b Import translations. DO NOT MERGE 
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
 2013-06-03 09:11:49 -07:00
Scott Main
aaae94aefa update dashbord for 6/3 
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
 2013-06-03 09:06:19 -07:00
John Spurlock
07e2795083 am 0f41c05e: am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0f41c05ececdf03f08d5c9a6155bd24e252dc8e7':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:55:04 -07:00
John Spurlock
0f41c05ece am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:52:56 -07:00
John Spurlock
0c2c62b29d Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 2013-06-03 15:50:44 +00:00
Andreas Huber
4a02d4c609 am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:48:30 -07:00
Andreas Huber
c41a0eff93 am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:46:20 -07:00
Andreas Huber
be22605d1e Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 2013-06-03 15:44:17 +00:00
Robert Greenwalt
293665686e am 53009832: am 05caa2a3: Apply scan-always setting to initial wifi state. 
* commit '530098327c19cfa3c31c4eabe316bf36ad4a848c':
  Apply scan-always setting to initial wifi state.
 2013-06-03 08:43:58 -07:00
Robert Greenwalt
530098327c am 05caa2a3: Apply scan-always setting to initial wifi state. 
* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40':
  Apply scan-always setting to initial wifi state.
 2013-06-03 08:41:48 -07:00
John Spurlock
84a369c33b Fix awkward wording in AppWidgetManager docs. 
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
 2013-06-03 11:38:48 -04:00
John Spurlock
77624cd71f Fix awkward wording in AppWidgetManager docs. 
Change-Id: I6d1e180be666b3d88e88f357e8d79f6bbc0c9857
 2013-06-03 09:47:01 -04:00
The Android Automerger
9c7ee73d9c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-03 05:55:11 -07:00
Mikhail Naganov
d18607980d Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use" 2013-06-03 08:39:44 +00:00
The Android Automerger
327f639336 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:28 -07:00
Robert Greenwalt
05caa2a3de Apply scan-always setting to initial wifi state. 
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.

bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
 2013-06-01 10:59:29 -07:00
Robert Greenwalt
156cf40148 am 66c7bd54: am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev 
* commit '66c7bd54046c567de5e3a4d332987a28ecb78092':
  Remember wifi country that's set before boot
 2013-06-01 09:52:18 -07:00
Dirk Dougherty
eb47aac14c am 0f70bcfc: am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '0f70bcfce3eb291e95e2a70f9d353efa862796da':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 09:52:14 -07:00
Wink Saville
61b7e872bf am ec82a7bd: am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit 'ec82a7bde5970b76f2940db25e35865a23c6ebc2':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 09:52:05 -07:00
Jason Sams
1b1c39d773 am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 
* commit 'd19068a7d28d129f5a1a1be478e972b40cea04eb':
  Fix free after use with createFromBitmapResource
 2013-06-01 09:51:46 -07:00
Baligh Uddin
17b2a01ded am 14fa7fe2: (-s ours) am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '14fa7fe20fbff7cfcc5daf0a1dce74a296fe3f86':
  Import translations. DO NOT MERGE
 2013-06-01 09:51:43 -07:00
Jim Miller
e77737f4cd am 2542fd54: am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 
* commit '2542fd54ac943002cb7537029404dcc80a6491ac':
  Fix keyguard issue where an incoming SMS would switch widget
 2013-06-01 09:51:40 -07:00
Robert Greenwalt
66c7bd5404 am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev 
* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot
 2013-06-01 08:58:16 -07:00
Robert Greenwalt
0161d229fd Merge "Remember wifi country that's set before boot" into jb-mr2-dev 2013-06-01 15:57:12 +00:00
Dirk Dougherty
0f70bcfce3 am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:35:13 -07:00
Dirk Dougherty
8ebfb8c9c3 am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:32:11 -07:00
Dirk Dougherty
fdc0c8618b am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'b18c725442e498a6447de37c3b9428b09837eda9':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:28:48 -07:00
Wink Saville
ec82a7bde5 am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '8ca5d64a39395ef6d9f800e843ef706c7ab8bf51':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:27:41 -07:00
Dirk Dougherty
b18c725442 am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:26:32 -07:00
Dirk Dougherty
a404a62951 am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '6fe992d88abc1c8c75ede638e6b0d52cd06f098f':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:24:12 -07:00
Jason Sams
d19068a7d2 am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 
* commit '413adc9260d700bd8143950951c4e1ad07cbeddf':
  Fix free after use with createFromBitmapResource
 2013-06-01 08:23:22 -07:00
Baligh Uddin
14fa7fe20f am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d':
  Import translations. DO NOT MERGE
 2013-06-01 08:23:19 -07:00
Jim Miller
2542fd54ac am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 
* commit '00d4c94625226ab325def94e9b82074f39572b43':
  Fix keyguard issue where an incoming SMS would switch widget
 2013-06-01 08:23:17 -07:00
Wink Saville
8ca5d64a39 am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:23:02 -07:00
Dirk Dougherty
6fe992d88a am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '4fad5c176a245203c1f8d26397ef6cc838753357':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:21:25 -07:00