OSDN Git Service
Scott Main [Mon, 5 Mar 2012 22:39:46 +0000 (14:39 -0800)]
am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:05 +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 21:32:20 +0000 (13:32 -0800)]
am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
afdf856d432fe5bae56152e42cb2c28ba63a5af0':
Scott Main [Mon, 5 Mar 2012 21:27:33 +0000 (13:27 -0800)]
am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
97aa69d32f52499db001970829a0e654564ea551':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:26:26 +0000 (13:26 -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: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 19:56:48 +0000 (11:56 -0800)]
am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
a7368087d6f1f2682174139d9cacab48dc7bc198':
Scott Main [Mon, 5 Mar 2012 19:54:36 +0000 (11:54 -0800)]
am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:59 +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: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:08:54 +0000 (10:08 -0800)]
am
bde31762: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
bde31762f989acbfde92e8f47ceea780cacc4e7a':
Scott Main [Mon, 5 Mar 2012 18:07:47 +0000 (10:07 -0800)]
am
08e91352: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
08e91352169457ac86a2465e4db867971ce14b10':
docs: fix misc bugs from external tracker
Scott Main [Mon, 5 Mar 2012 18:06:04 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
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
The Android Open Source Project [Sat, 3 Mar 2012 00:48:24 +0000 (16:48 -0800)]
am
37d6d98f: Reconcile with ics-mr1-release
* commit '
37d6d98fe3ea739627e03b78196faba55b427503':
Scott Main [Sat, 3 Mar 2012 00:44:21 +0000 (16:44 -0800)]
am
cc902c78: 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 '
cc902c78e41549749ad98d96530bef25a3aeae47':
The Android Open Source Project [Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Scott Main [Sat, 3 Mar 2012 00:42:36 +0000 (16:42 -0800)]
am
9ad705ce: 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 '
9ad705ce0b8271931f9a09d181069c7466afade4':
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
Scott Main [Sat, 3 Mar 2012 00:40:21 +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
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:35:27 +0000 (16:35 -0800)]
am
3e72c93b: Reconcile with ics-mr1-release
* commit '
3e72c93b1652ec021fa0965e432b508b847b2b74':
The Android Open Source Project [Sat, 3 Mar 2012 00:32:56 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
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:10:22 +0000 (09:10 -0800)]
Robert Ly [Fri, 2 Mar 2012 17:09:30 +0000 (09:09 -0800)]
am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
67a15457d184f01fffe162a0983d0b507cb7b358':
docs: fixing bug
5942573
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: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:37:48 +0000 (08:37 -0800)]
am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
921e83039d266b6d288fd5e09160d878eccb9e23':
Dianne Hackborn [Fri, 2 Mar 2012 16:36:05 +0000 (08:36 -0800)]
am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
f65951bf5db7a248651cbfa89886d773f95c3e03':
Make ResolverActivity update dynamically.
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:33:21 +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:52:39 +0000 (22:52 -0800)]
am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
Fix dividers for LinearLayout (TabWidget)
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)
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:11:22 +0000 (17:11 -0800)]
am
673a66e3: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
673a66e357f49f939cf8e7f603ff14b8474c9032':
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:10:23 +0000 (17:10 -0800)]
am
bb69bde5: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
bb69bde593bc0ba58c744b19c43619d4eb0866b7':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:43 +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: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:15:03 +0000 (14:15 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:13:15 +0000 (14:13 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:11:05 +0000 (14:11 -0800)]
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:48:42 +0000 (12:48 -0800)]
Robert Ly [Thu, 1 Mar 2012 20:47:44 +0000 (12:47 -0800)]
am
8125b0b4: am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
8125b0b4343b7f480196ce73103ca00cdf64f9e5':
docs: fix bug
5878445
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:44:35 +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
The Android Open Source Project [Thu, 1 Mar 2012 18:46:52 +0000 (10:46 -0800)]
am
4f306bec: Reconcile with ics-mr1-release
* commit '
4f306becef17ea986522202cc8c90b0e32e2ded1':
The Android Open Source Project [Thu, 1 Mar 2012 18:40:12 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
The Android Open Source Project [Thu, 1 Mar 2012 18:14:27 +0000 (10:14 -0800)]
am
f8e58c8b: Reconcile with ics-mr1-release
* commit '
f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
The Android Open Source Project [Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
Android Git Automerger [Thu, 1 Mar 2012 15:35:22 +0000 (07:35 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:04:11 +0000 (19:04 -0800)]
am
d12347b2: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
d12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:03:40 +0000 (19:03 -0800)]
am
0ddfe24a: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
0ddfe24a19882bb355313b6c5c14dcb0c6608365':
Set the video encoding bit rate for the media recorder stress test.
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 [Thu, 1 Mar 2012 03:00:00 +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.
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:30 +0000 (15:51 -0800)]
am
964955e0: am
8a9b14d8: am
5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '
964955e0bd98166c16f705811ce46d0151924cc8':
DRM framwork bug fix: add an API to release resources
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:28 +0000 (15:51 -0800)]
am
93920d79: am
a66be970: am
11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '
93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
Set width of spinner's dropdown to fit on device
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:25 +0000 (15:51 -0800)]
am
c69d6134: am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
c69d61343913848b467022ef63f2c84cbc5ec34b':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:23 +0000 (15:51 -0800)]
am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
4f9063622415ea083bbd639af06e98065ce7176d':
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:51:19 +0000 (15:51 -0800)]
am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
stagefright aacenc: Safeguard against overwriting bits
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:30:51 +0000 (13:30 -0800)]
am
d31da0a6: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
d31da0a670a60722339faa18e1147adb9c14532d':
Eric Fischer [Wed, 29 Feb 2012 21:28:52 +0000 (13:28 -0800)]
am
ba62da99: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
Mark configuration strings as not translatable.
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:26:08 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Roman Nurik [Wed, 29 Feb 2012 20:49:31 +0000 (12:49 -0800)]
am
86ca108c: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
86ca108c65c3f8400e750d639b71d6a3cef5b600':
Roman Nurik [Wed, 29 Feb 2012 20:45:16 +0000 (12:45 -0800)]
am
c47369d7: am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -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 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.
Robert Ly [Tue, 28 Feb 2012 23:43:52 +0000 (15:43 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:42:32 +0000 (15:42 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:39 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
Dianne Hackborn [Tue, 28 Feb 2012 23:16:20 +0000 (15:16 -0800)]
am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
The Android Automerger [Tue, 28 Feb 2012 23:14:55 +0000 (15:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 28 Feb 2012 23:07:43 +0000 (15:07 -0800)]
am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:18 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
OSDN Git Service
