OSDN Git Service
Robert Ly [Wed, 14 Mar 2012 22:46:10 +0000 (15:46 -0700)]
am
b285125d: Merge "docs: android u search class" into ics-mr1
* commit '
b285125d4bad1c76e95cd24956711deb9908c4a8':
docs: android u search class
Robert Ly [Wed, 14 Mar 2012 22:41:02 +0000 (15:41 -0700)]
Merge "docs: android u search class" into ics-mr1
Scott Main [Wed, 14 Mar 2012 06:12:18 +0000 (23:12 -0700)]
am
7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '
7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
docs: remove link from GP logo
Scott Main [Wed, 14 Mar 2012 06:09:09 +0000 (23:09 -0700)]
Merge "docs: remove link from GP logo" into ics-mr1
Robert Ly [Fri, 3 Feb 2012 19:00:47 +0000 (11:00 -0800)]
docs: android u search class
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
Daniel Lehmann [Tue, 13 Mar 2012 01:24:41 +0000 (18:24 -0700)]
am
0e873700: Remove the country detector logging
* commit '
0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
Daniel Lehmann [Tue, 13 Mar 2012 00:04:17 +0000 (17:04 -0700)]
Remove the country detector logging
Bug:
6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
Wink Saville [Mon, 12 Mar 2012 22:54:38 +0000 (15:54 -0700)]
am
f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '
f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Wink Saville [Sat, 10 Mar 2012 21:23:35 +0000 (13:23 -0800)]
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.
Bug:
6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
Scott Main [Sat, 10 Mar 2012 03:12:53 +0000 (19:12 -0800)]
docs: remove link from GP logo
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
Conley Owens [Fri, 9 Mar 2012 23:10:08 +0000 (15:10 -0800)]
am
9a3f3b9d: am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:09:58 +0000 (15:09 -0800)]
am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:06:53 +0000 (15:06 -0800)]
am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:06:48 +0000 (15:06 -0800)]
am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 16:54:57 +0000 (08:54 -0800)]
Merge "stagefright amrwbenc: Simplify the definition of static_vo"
Conley Owens [Fri, 9 Mar 2012 16:53:39 +0000 (08:53 -0800)]
Merge changes I00c852e4,Ib31bf028
* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Derek Sollenberger [Fri, 9 Mar 2012 01:46:33 +0000 (17:46 -0800)]
am
d7978a28: am
34ccd7af: Merge "Add missing includes for threads.h"
* commit '
d7978a28219465e0e579adee3c9258b04c0a5b40':
Add missing includes for threads.h
Derek Sollenberger [Fri, 9 Mar 2012 01:43:21 +0000 (17:43 -0800)]
am
34ccd7af: Merge "Add missing includes for threads.h"
* commit '
34ccd7af4216f571c2f88b32fea8bfed8ef0baab':
Add missing includes for threads.h
Megha Joshi [Thu, 8 Mar 2012 20:25:08 +0000 (12:25 -0800)]
am
33372b21: Merge "A few updates for TVs." into ics-mr1
* commit '
33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
Megha Joshi [Thu, 8 Mar 2012 20:22:49 +0000 (12:22 -0800)]
Merge "A few updates for TVs." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 20:21:55 +0000 (12:21 -0800)]
am
84099f3d: Merge "Adding TV related updates." into ics-mr1
* commit '
84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
Megha Joshi [Thu, 8 Mar 2012 20:20:21 +0000 (12:20 -0800)]
Merge "Adding TV related updates." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 00:09:05 +0000 (16:09 -0800)]
A few updates for TVs.
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
Derek Sollenberger [Thu, 8 Mar 2012 19:59:01 +0000 (11:59 -0800)]
Merge "Add missing includes for threads.h"
Megha Joshi [Thu, 8 Mar 2012 01:11:12 +0000 (17:11 -0800)]
Adding TV related updates.
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
Scott Main [Thu, 8 Mar 2012 01:19:22 +0000 (17:19 -0800)]
am
99e790de: docs: add troido adk link
* commit '
99e790de9ea23f59933fd695ca35bb6d1033b4e9':
docs: add troido adk link
Scott Main [Wed, 7 Mar 2012 00:17:08 +0000 (16:17 -0800)]
docs: add troido adk link
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
Roman Nurik [Tue, 6 Mar 2012 22:42:59 +0000 (14:42 -0800)]
am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
Roman Nurik [Tue, 6 Mar 2012 22:39:54 +0000 (14:39 -0800)]
Merge "docs: move Android Design from static HTML to JD" into ics-mr1
Scott Main [Tue, 6 Mar 2012 22:25:27 +0000 (14:25 -0800)]
am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:23:23 +0000 (14:23 -0800)]
Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
Scott Main [Tue, 6 Mar 2012 21:57:32 +0000 (13:57 -0800)]
am
97b94e78: docs: a few more Market -> Play strings
* commit '
97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
docs: a few more Market -> Play strings
Roman Nurik [Tue, 6 Mar 2012 20:26:15 +0000 (12:26 -0800)]
docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
Scott Main [Tue, 6 Mar 2012 20:10:17 +0000 (12:10 -0800)]
docs: a few more Market -> Play strings
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
Scott Main [Tue, 6 Mar 2012 19:23:36 +0000 (11:23 -0800)]
Fix badge generator URLs and images, and update
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.
Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
Dirk Dougherty [Tue, 6 Mar 2012 17:38:31 +0000 (09:38 -0800)]
am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
Update build-a-button to use new assets.
Dirk Dougherty [Tue, 6 Mar 2012 09:48:26 +0000 (01:48 -0800)]
Update build-a-button to use new assets.
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
Derek Sollenberger [Mon, 5 Mar 2012 21:48:32 +0000 (16:48 -0500)]
Add missing includes for threads.h
The missing header was being transitively included through a
Skia header which is being removed.
Change-Id: I5a65bae076027951fe07d1e7eecd4732124fb0e4
Pin Ting [Tue, 6 Mar 2012 08:57:55 +0000 (00:57 -0800)]
am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
25c66c3a4a51617099e848a9376313c90a1ec9ae':
Fix document.
Pin Ting [Tue, 6 Mar 2012 08:55:49 +0000 (00:55 -0800)]
Merge "Fix document." into ics-mr1
Scott Main [Tue, 6 Mar 2012 08:48:44 +0000 (00:48 -0800)]
am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
1c2473042236dd63774d7a2c5edfd991b4ef1b3e':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Pin Ting [Fri, 2 Mar 2012 16:13:32 +0000 (00:13 +0800)]
Fix document.
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
Scott Main [Fri, 2 Mar 2012 23:49:34 +0000 (15:49 -0800)]
docs: update homepage announcement for GP
Still needs an update with proper blog link
(will probably do by hand for launch push)
Change-Id: I660082780ffd27cf591351e6b65be61a109a6d5d
Dirk Dougherty [Tue, 6 Mar 2012 06:55:49 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Sat, 28 Jan 2012 01:56:49 +0000 (17:56 -0800)]
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
Scott Main [Tue, 6 Mar 2012 04:19:53 +0000 (20:19 -0800)]
am
e606cb46: docs: fix api dashboard
* commit '
e606cb460272cd99bac05b4477a5e489827b368b':
docs: fix api dashboard
Scott Main [Tue, 6 Mar 2012 04:14:16 +0000 (20:14 -0800)]
docs: fix api dashboard
Change-Id: Ifbd596860f3368811e31494176682571be919459
Scott Main [Tue, 6 Mar 2012 01:40:43 +0000 (17:40 -0800)]
am
290684ac: docs: fix expansion library package name
* commit '
290684ac2eadf786d2f478d3d280eb3058627789':
docs: fix expansion library package name
Scott Main [Tue, 6 Mar 2012 01:35:36 +0000 (17:35 -0800)]
docs: fix expansion library package name
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
Scott Main [Mon, 5 Mar 2012 22:36:47 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:21:24 +0000 (14:21 -0800)]
docs: dashboard update for march 5
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
Scott Main [Mon, 5 Mar 2012 21:25:54 +0000 (13:25 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:22:56 +0000 (13:22 -0800)]
docs: add note about declaring file sizes with sample app's code
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
Scott Main [Mon, 5 Mar 2012 19:52:41 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:51:03 +0000 (11:51 -0800)]
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
Scott Main [Mon, 5 Mar 2012 18:56:39 +0000 (10:56 -0800)]
docs: updates to OBB guide for naming; plus other edits
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
Scott Main [Mon, 5 Mar 2012 18:06:00 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
Scott Main [Fri, 24 Feb 2012 20:04:06 +0000 (12:04 -0800)]
docs: fix misc bugs from external tracker
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
Scott Main [Sat, 3 Mar 2012 00:40:00 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
The Android Open Source Project [Sat, 3 Mar 2012 00:32:56 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
Scott Main [Thu, 7 Jul 2011 21:51:56 +0000 (14:51 -0700)]
docs: add docs for market OBB
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing
Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
The Android Automerger [Fri, 2 Mar 2012 19:51:23 +0000 (11:51 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
Dianne Hackborn [Fri, 2 Mar 2012 16:33:22 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Adam Powell [Fri, 2 Mar 2012 06:49:46 +0000 (22:49 -0800)]
am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
637c50db476d9a6cec13551920f7c163fef02ab8':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:46:26 +0000 (22:46 -0800)]
am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
c7e5a2fe3042014f78667228a92e41d0a19547fd':
Fix dividers for LinearLayout (TabWidget)
Dianne Hackborn [Fri, 2 Mar 2012 01:30:53 +0000 (17:30 -0800)]
Make ResolverActivity update dynamically.
Watches for package changes so it can dynamically adjust
to reflect the actual list of available activities.
Change-Id: I3a2fef3dac4d13d1b2a7ed6fc117a7b814679669
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:25 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)]
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
Adam Powell [Fri, 2 Mar 2012 00:26:03 +0000 (16:26 -0800)]
Merge "Fix dividers for LinearLayout (TabWidget)"
Robert Ly [Thu, 1 Mar 2012 22:10:46 +0000 (14:10 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:08:40 +0000 (14:08 -0800)]
Merge "fix bug
5942522" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:44:36 +0000 (12:44 -0800)]
am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:42:24 +0000 (12:42 -0800)]
Merge "docs: fix bug
5878445" into ics-mr1
Tsu Chiang Chuang [Wed, 29 Feb 2012 17:55:38 +0000 (09:55 -0800)]
extend timeout to allow for more time for the device to connect.
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
The Android Open Source Project [Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:08 +0000 (19:00 -0800)]
am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
eb4f3256b77fe7fd783297a550a64ea441c41169':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Wed, 29 Feb 2012 23:57:21 +0000 (15:57 -0800)]
Set the video encoding bit rate for the media
recorder stress test.
Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:45 +0000 (15:47 -0800)]
am
8a9b14d8: am
5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '
8a9b14d80530eccf801fa794bacf287813b5978f':
DRM framwork bug fix: add an API to release resources
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:42 +0000 (15:47 -0800)]
am
a66be970: am
11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '
a66be970999c5eec1c8efb46e196f19ae563fc9b':
Set width of spinner's dropdown to fit on device
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:38 +0000 (15:47 -0800)]
am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:35 +0000 (15:47 -0800)]
am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9734843102c074c56ac72e221db0f51ae2fa79ec':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:32 +0000 (15:47 -0800)]
am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
f9d4ba77f45d8f0efe97abb28247cbca12836dca':
stagefright aacenc: Safeguard against overwriting bits
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:41 +0000 (15:44 -0800)]
am
5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '
5aeb85877a95cc12c0784757a9842983b04e8600':
DRM framwork bug fix: add an API to release resources
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:38 +0000 (15:44 -0800)]
am
11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '
11aa4cc38b646f62eb22842d7510415b61c2ef84':
Set width of spinner's dropdown to fit on device
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:34 +0000 (15:44 -0800)]
am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
9303919d7d837dedf16f09ace0013e62670568e7':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:31 +0000 (15:44 -0800)]
am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
704131cb7e4f9cc682ea57ed569375f9f289368e':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:28 +0000 (15:44 -0800)]
am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:12:47 +0000 (15:12 -0800)]
Merge "DRM framwork bug fix: add an API to release resources"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:09:16 +0000 (15:09 -0800)]
Merge "Set width of spinner's dropdown to fit on device"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:38:57 +0000 (14:38 -0800)]
Merge "Adds documentation for ContentResolver notifyChange()"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)]
Merge changes I46c81dba,If1f40e9c,I652eaaa5
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:23:38 +0000 (14:23 -0800)]
Merge "stagefright aacenc: Safeguard against overwriting bits"
Eric Fischer [Wed, 29 Feb 2012 21:26:13 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:19:58 +0000 (13:19 -0800)]
Mark configuration strings as not translatable.
Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
Roman Nurik [Wed, 29 Feb 2012 20:42:39 +0000 (12:42 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 19:59:32 +0000 (11:59 -0800)]
docs: Android Design downloads section, linkable H2s.
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
Kei Takahashi [Tue, 31 Jan 2012 04:18:45 +0000 (13:18 +0900)]
DRM framwork bug fix: add an API to release resources
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.
The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.
By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.
Changes are made by SEMC and Sony.
Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b