OSDN Git Service
Scott Main [Thu, 6 Jun 2013 19:51:53 +0000 (12:51 -0700)]
am
6e3c1222: am
47029086: am
2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
* commit '
6e3c1222f06bf5b3be271a06e32d371c68fafb0e':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
Scott Main [Thu, 6 Jun 2013 19:49:35 +0000 (12:49 -0700)]
am
47029086: am
2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
* commit '
47029086ca4fee758df1ee015d6534bd566647a1':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
Scott Main [Thu, 6 Jun 2013 19:46:41 +0000 (12:46 -0700)]
am
2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
* commit '
2f55af55fca237b8d675dbe5b1b7da1821d630fc':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
Scott Main [Thu, 6 Jun 2013 19:33:08 +0000 (12:33 -0700)]
add redirects for UI guideline docs,
as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
Change-Id: I81edd9e30e8d522adb185c8dab8d303577ef6f01
Scott Main [Thu, 6 Jun 2013 19:07:14 +0000 (12:07 -0700)]
am
c090ce8c: am
c5131567: am
2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version,
* commit '
c090ce8c6f0d8c4fc176be4bb182548f11a3a13e':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
Scott Main [Thu, 6 Jun 2013 19:05:37 +0000 (12:05 -0700)]
am
c5131567: am
2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya k
* commit '
c51315674f27a12840c9e12d1ec7e0006bdba054':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
Scott Main [Thu, 6 Jun 2013 19:04:03 +0000 (12:04 -0700)]
am
2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony."
* commit '
2d312a987aa768c148c16742d6ad622279fb6e42':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
Scott Main [Thu, 6 Jun 2013 19:02:41 +0000 (19:02 +0000)]
Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony." into jb-mr1.1-ub-dev
Joe Malin [Thu, 6 Jun 2013 17:49:27 +0000 (17:49 +0000)]
Merge "Doc bug
B9297954: Fixes to Location APIs" into jb-mr2-dev
Dirk Dougherty [Thu, 6 Jun 2013 17:47:34 +0000 (10:47 -0700)]
am
f1469855: am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
f14698551aeb57dc1952413480cb72a0c8ffb620':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:46:14 +0000 (10:46 -0700)]
am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
86927797869512f87e0ba6be5b83564e4a773b71':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:43:34 +0000 (10:43 -0700)]
am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
cf35c5e35d15f9ced64e739bd216dae7d0cbd8ae':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:41:45 +0000 (10:41 -0700)]
am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
497584edbacb15b174901da21bc94f37528ac7d1':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:39:22 +0000 (10:39 -0700)]
am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
16fdbd1729e9473f6176c88c59538fc5c371154f':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:36:29 +0000 (17:36 +0000)]
Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
Dirk Dougherty [Thu, 6 Jun 2013 17:34:40 +0000 (10:34 -0700)]
Doc change: fix broken link to localization checklist.
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
kmccormick [Thu, 6 Jun 2013 01:32:23 +0000 (18:32 -0700)]
am
57394e3d: am
2fbe1094: am
3ef445a8: am
68291f33: am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
57394e3daff094c28ee2a2fb886e1764a1b7728d':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:30:19 +0000 (18:30 -0700)]
am
2fbe1094: am
3ef445a8: am
68291f33: am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
2fbe109466ba582663fdc0f98ff4b9aeeb15ce32':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:27:50 +0000 (18:27 -0700)]
am
3ef445a8: am
68291f33: am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
3ef445a80aea4670855f4cabe8072f16c1ff5128':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:26:16 +0000 (18:26 -0700)]
am
68291f33: am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
68291f33e03be5180dc5c921d71cafbc83507301':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:25:12 +0000 (18:25 -0700)]
am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
db3158ead35f28ea31a7b6d87c50108cf972a9c0':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:22:54 +0000 (01:22 +0000)]
Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 02:06:41 +0000 (19:06 -0700)]
Doc update: Refactoring to client/server.
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
Dianne Hackborn [Wed, 5 Jun 2013 22:14:38 +0000 (22:14 +0000)]
Merge "Maybe fix issue #
9296868: Crash in system process" into jb-mr2-dev
Jeff Brown [Wed, 5 Jun 2013 22:00:58 +0000 (22:00 +0000)]
Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev
Dianne Hackborn [Wed, 5 Jun 2013 21:53:33 +0000 (14:53 -0700)]
Maybe fix issue #
9296868: Crash in system process
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.
Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
Scott Main [Wed, 5 Jun 2013 21:29:50 +0000 (14:29 -0700)]
small cleanup of trigger event javadoc
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
Tim Murray [Wed, 5 Jun 2013 20:45:00 +0000 (20:45 +0000)]
Merge "Update RenderScript API guide." into jb-mr2-dev
Tim Murray [Wed, 5 Jun 2013 20:44:36 +0000 (20:44 +0000)]
Merge "Improve RS documentation." into jb-mr2-dev
Joe Malin [Wed, 5 Jun 2013 20:16:39 +0000 (13:16 -0700)]
Doc bug
B9297954: Fixes to Location APIs
Change-Id: I6c496fb46e0b35f3ee2be83369326ebf7be1a874
Winson Chung [Wed, 5 Jun 2013 18:45:41 +0000 (18:45 +0000)]
Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)" into jb-mr2-dev
Tim Murray [Thu, 30 May 2013 19:34:40 +0000 (12:34 -0700)]
Update RenderScript API guide.
bug
8570568
Change-Id: Ib49a63f15ce421115179764a14597b2746a1f2e7
Tim Murray [Tue, 9 Apr 2013 18:01:01 +0000 (11:01 -0700)]
Improve RS documentation.
bug
8570568
Change-Id: I465fcc8ec3e2cc892dc3cb0067aacf5224338102
Scott Main [Mon, 3 Jun 2013 19:39:06 +0000 (12:39 -0700)]
add design tips to iconography page.
Accounts for the removal of the previous UI guideline pages,
which is where most of this new content came from.
Also update figure to add xxhdpi and remove ldpi,
and include 2x version, because ya know, irony.
Change-Id: Ia37ef1a65bdf9c4173a323ae37fffe03b53a6fcf
Scott Main [Wed, 5 Jun 2013 02:29:24 +0000 (19:29 -0700)]
add link to required permission from ACTION_RESPOND_VIA_MESSAGE
Change-Id: Iafa9c72c9bbd8258c7f961f7ab8ad78c96b61e54
Jeff Sharkey [Tue, 4 Jun 2013 23:55:36 +0000 (23:55 +0000)]
Merge "Create missing Uids when recording network stats." into jb-mr2-dev
Baligh Uddin [Tue, 4 Jun 2013 22:40:50 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
Winson Chung [Tue, 4 Jun 2013 21:25:28 +0000 (14:25 -0700)]
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
Jeff Sharkey [Tue, 4 Jun 2013 21:09:31 +0000 (14:09 -0700)]
Create missing Uids when recording network stats.
Bug:
5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
Joe Malin [Tue, 4 Jun 2013 17:17:46 +0000 (10:17 -0700)]
am
305cf97b: am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
305cf97ba7b927f49d3f52952c36cb5102699cc5':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:14:48 +0000 (10:14 -0700)]
am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
60776093a5569817040e2f65a17893a381906564':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:12:09 +0000 (10:12 -0700)]
am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
029099ff56b92201e10b2047e1ced675c8e9f964':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:09:44 +0000 (10:09 -0700)]
am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
f4b21585304781c61d00fa6a14a85fae60f6a50d':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:07:16 +0000 (10:07 -0700)]
am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
10d96950c14ae647c2e8435178533cafc78e1afa':
DOC CHANGE: Clarify textIsSelectable in TextView
Scott Main [Tue, 4 Jun 2013 16:42:22 +0000 (16:42 +0000)]
Merge "javadoc cleanup for audioeffect" into jb-mr2-dev
Joe Malin [Thu, 30 May 2013 00:49:09 +0000 (17:49 -0700)]
DOC CHANGE: Clarify textIsSelectable in TextView
Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b
Xia Wang [Tue, 4 Jun 2013 04:23:28 +0000 (04:23 +0000)]
Merge "Add option to set frequency band" into jb-mr2-dev
Dirk Dougherty [Tue, 4 Jun 2013 02:20:46 +0000 (19:20 -0700)]
am
59b77878: am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
59b77878944f5012fd5a65fc1a845a053220a436':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:19:20 +0000 (19:19 -0700)]
am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
63c904c2d7651089821c4760ab30b71e9000374e':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:16:37 +0000 (19:16 -0700)]
am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
4c8caaa2ef6edc1898a5146cc15eb87c5997d35c':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:13:46 +0000 (19:13 -0700)]
am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
5ca78f5963e49b48896fa866aeb032a37ba15360':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:11:26 +0000 (19:11 -0700)]
am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
8e307adcf62c639d25c16f6071d458561ce4bef3':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:08:20 +0000 (02:08 +0000)]
Merge "Doc change: Add new developer video." into jb-mr1.1-docs
Dirk Dougherty [Tue, 4 Jun 2013 01:39:52 +0000 (18:39 -0700)]
Doc change: Add new developer video.
Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7
Scott Main [Tue, 4 Jun 2013 00:24:09 +0000 (17:24 -0700)]
javadoc cleanup for audioeffect
Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
Joe Malin [Mon, 3 Jun 2013 21:27:50 +0000 (14:27 -0700)]
am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
2618ac55a94a97e29abd9defa93dea30e067b4e4':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:23:08 +0000 (14:23 -0700)]
am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
a37bda7b616452d0072b012cc7ae8fcae51e943f':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:20:45 +0000 (14:20 -0700)]
am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
468d82bb7150996c8b2b4228d0e8d031f74e304b':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:18:22 +0000 (14:18 -0700)]
am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:17:15 +0000 (14:17 -0700)]
am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
b6a35268ccb698cde6d2e1e2f475a7299112b034':
B9257437: Typo in javadoc for AccountManager
Baligh Uddin [Mon, 3 Jun 2013 21:14:23 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Joe Malin [Mon, 3 Jun 2013 16:49:04 +0000 (09:49 -0700)]
B9257437: Typo in javadoc for AccountManager
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
Scott Main [Mon, 3 Jun 2013 18:33:13 +0000 (11:33 -0700)]
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
Scott Main [Mon, 3 Jun 2013 18:17:15 +0000 (11:17 -0700)]
am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4a024be4de71f90eaaff7be8122926bdc9297d38':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:15:16 +0000 (11:15 -0700)]
am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4cef8150c83ce60a4d3acc495132357fb9bd1458':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:12:54 +0000 (18:12 +0000)]
Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
Baligh Uddin [Mon, 3 Jun 2013 16:11:49 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
Scott Main [Mon, 3 Jun 2013 16:06:19 +0000 (09:06 -0700)]
update dashbord for 6/3
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
John Spurlock [Mon, 3 Jun 2013 15:50:43 +0000 (15:50 +0000)]
Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
Andreas Huber [Mon, 3 Jun 2013 15:44:16 +0000 (15:44 +0000)]
Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
John Spurlock [Mon, 3 Jun 2013 15:38:48 +0000 (11:38 -0400)]
Fix awkward wording in AppWidgetManager docs.
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
Robert Greenwalt [Sat, 1 Jun 2013 17:59:29 +0000 (10:59 -0700)]
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
Robert Greenwalt [Sat, 1 Jun 2013 15:57:12 +0000 (15:57 +0000)]
Merge "Remember wifi country that's set before boot" into jb-mr2-dev
Dirk Dougherty [Sat, 1 Jun 2013 15:32:11 +0000 (08:32 -0700)]
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.
Dirk Dougherty [Sat, 1 Jun 2013 15:28:48 +0000 (08:28 -0700)]
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.
Dirk Dougherty [Sat, 1 Jun 2013 15:26:32 +0000 (08:26 -0700)]
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.
Dirk Dougherty [Sat, 1 Jun 2013 15:24:12 +0000 (08:24 -0700)]
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.
Dirk Dougherty [Sat, 1 Jun 2013 15:21:25 +0000 (08:21 -0700)]
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.
Robert Greenwalt [Sat, 1 Jun 2013 00:57:10 +0000 (17:57 -0700)]
Remember wifi country that's set before boot
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time. Remember
and write it on BOOT_COMPLETED
Also, there are permission issues around writing the setting.
bug:
9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
Jeff Brown [Sat, 1 Jun 2013 00:59:11 +0000 (17:59 -0700)]
Fix regression in long-press home behavior on tablets.
Some config.xml resources have values that vary based on the
configuration. A previous change caused initialization to
occur at a time when the configuration is was not yet available.
This change fixes the problem.
Bug:
8891502
Change-Id: Ia768dc2308cc6ae5f11812c6bce6a6e116cfd759
Jason Sams [Sat, 1 Jun 2013 00:54:17 +0000 (00:54 +0000)]
Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
Baligh Uddin [Fri, 31 May 2013 22:30:29 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jim Miller [Fri, 31 May 2013 21:41:34 +0000 (21:41 +0000)]
Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev
Andreas Huber [Tue, 28 May 2013 21:39:39 +0000 (14:39 -0700)]
Listen for HTTP proxy changes and propagate the information to the media
framework.
related-to-bug:
8873723
Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit
bfe9154142428aa8abecaf943dfeffc55f411ea7)
Xia Wang [Tue, 21 May 2013 21:18:56 +0000 (14:18 -0700)]
Add option to set frequency band
- The reason to add the test runner is to set frequency band when the runner
is created which happens before the test activity is actually launch.
As the test activity will disable/enable wifi when it
is created, this cycle will ensure the frequency is set successfully.
Change-Id: Ie9de3d8bab3dda7d4bb9ba604ddd5cb33164e397
Dirk Dougherty [Fri, 31 May 2013 21:08:45 +0000 (21:08 +0000)]
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
Jason Sams [Fri, 31 May 2013 21:00:46 +0000 (14:00 -0700)]
Fix free after use with createFromBitmapResource
Bug
9227350
Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
kmccormick [Fri, 31 May 2013 20:38:15 +0000 (13:38 -0700)]
am
7356dde4: am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
7356dde40439e2c787d28ed05aff4ff81d8a2d39':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:36:43 +0000 (13:36 -0700)]
am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
a75fb065aff42ff7671a5b418229294f43da5cf3':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:34:09 +0000 (13:34 -0700)]
am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
c02821efde98a62fe9bbfd718847a8c3bd90eea2':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:32:52 +0000 (13:32 -0700)]
am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
eca0125267d453ab60631317a44abe869eb660fe':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:31:23 +0000 (13:31 -0700)]
am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
3886fad5d1c50dd14b11185104401887bc129c7f':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:28:57 +0000 (20:28 +0000)]
Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 19:28:05 +0000 (12:28 -0700)]
Doc Update: fix host title in main doc.
Change-Id: Ide683eb651ea7b485dae6c4d348b19a8d988187b
ztenghui [Fri, 31 May 2013 18:05:43 +0000 (18:05 +0000)]
Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
Scott Main [Fri, 31 May 2013 18:00:26 +0000 (11:00 -0700)]
am
75e12713: am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
75e12713108954237991960a9e4b0482063bc09c':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:58:33 +0000 (10:58 -0700)]
am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
c1032ccae3511de06cf76a700627c41f0b71209e':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:57:24 +0000 (10:57 -0700)]
am
ca9948ae: revise migrating to Studio procedure
* commit '
ca9948ae33e4ffdc057cc8f2b1efef9c38625436':
revise migrating to Studio procedure
ztenghui [Fri, 31 May 2013 17:50:04 +0000 (10:50 -0700)]
MediaMuxer sample code update, no functional change
bug:
9213533
Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
Scott Main [Fri, 31 May 2013 17:42:35 +0000 (10:42 -0700)]
revise migrating to Studio procedure
Change-Id: Ic8d2498414ccdbe45b7ce349ecb84925e9830ee9
OSDN Git Service
