OSDN Git Service
Nick Pelly [Mon, 20 Dec 2010 19:29:40 +0000 (11:29 -0800)]
am
29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread
* commit '
29f9ee973eefea3c68382ed38e69db1f1a396f3f':
Need to check ndef before writing ndef.
Scott Main [Mon, 20 Dec 2010 19:29:32 +0000 (11:29 -0800)]
am
0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
* commit '
0d1e38ef99252cb14e6bcc4b3135021da025330f':
cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
Nick Pelly [Fri, 17 Dec 2010 00:35:51 +0000 (16:35 -0800)]
Merge "Need to check ndef before writing ndef." into gingerbread
Eric Laurent [Fri, 17 Dec 2010 00:05:16 +0000 (16:05 -0800)]
am
5a756fb0: Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '
5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
Scott Main [Fri, 17 Dec 2010 00:05:00 +0000 (16:05 -0800)]
am
3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
* commit '
3165bbb15560ed9facdfb906da55a9b24eb5989a':
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
Scott Main [Fri, 17 Dec 2010 00:04:54 +0000 (16:04 -0800)]
am
4ea442b4: Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
* commit '
4ea442b49c2f44c180346fe780a2b8c9766b587b':
cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links
Martijn Coenen [Fri, 17 Dec 2010 00:04:47 +0000 (16:04 -0800)]
am
c58c3f1a: Implement additional Mifare Ultralight convenience methods.
* commit '
c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
Implement additional Mifare Ultralight convenience methods.
Martijn Coenen [Fri, 17 Dec 2010 00:04:41 +0000 (16:04 -0800)]
am
0d27f999: Expose reconnect(), to allow applications to reset tag state.
* commit '
0d27f999f4b1ad51da11946800b40d2978fc6326':
Expose reconnect(), to allow applications to reset tag state.
Martijn Coenen [Fri, 17 Dec 2010 00:04:28 +0000 (16:04 -0800)]
am
4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
* commit '
4049f9d00a86f848d42d2429068496b31a6795ad':
Implement multi-tech connect, enfore tech exclusivity.
Eric Laurent [Thu, 16 Dec 2010 19:18:29 +0000 (11:18 -0800)]
Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
Scott Main [Thu, 16 Dec 2010 01:47:02 +0000 (17:47 -0800)]
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
Scott Main [Wed, 15 Dec 2010 22:11:08 +0000 (14:11 -0800)]
am
b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
* commit '
b094b0c4a4309f48d9da7253de78ebda20a8a81c':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
Dianne Hackborn [Wed, 15 Dec 2010 20:58:54 +0000 (12:58 -0800)]
am
7daaa98c: Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
* commit '
7daaa98c6531373a2a742c1360f0a2795de0619f':
Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity
Dianne Hackborn [Wed, 15 Dec 2010 20:56:53 +0000 (12:56 -0800)]
Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
Scott Main [Wed, 15 Dec 2010 19:56:04 +0000 (11:56 -0800)]
am
52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
* commit '
52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
Scott Main [Wed, 15 Dec 2010 19:56:00 +0000 (11:56 -0800)]
am
6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
* commit '
6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
Scott Main [Wed, 15 Dec 2010 19:53:20 +0000 (11:53 -0800)]
am
92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
* commit '
92b0308530d21195425c918cbe6057dd84f37992':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
Scott Main [Wed, 15 Dec 2010 01:45:24 +0000 (17:45 -0800)]
am
e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
* commit '
e09009d6a63cfab2a64d02ca49a462d46e62f750':
cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
Scott Main [Wed, 15 Dec 2010 01:42:28 +0000 (17:42 -0800)]
am
369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '
369c1c1fa22802b6504c5cde533d797841700a66':
cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
Scott Main [Wed, 15 Dec 2010 01:34:35 +0000 (17:34 -0800)]
am
090a3dc3: cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
* commit '
090a3dc33fbb0d450dd5823fd2756360e4acdd12':
cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
Scott Main [Wed, 15 Dec 2010 01:30:04 +0000 (17:30 -0800)]
am
0846a2f5: cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
* commit '
0846a2f5ec77a8862d92430b6721da0960d0d001':
cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
Scott Main [Wed, 15 Dec 2010 01:06:58 +0000 (17:06 -0800)]
am
1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
* commit '
1bcfd85cc0f274b250b68a122f964b276ef4be4a':
cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
Scott Main [Wed, 15 Dec 2010 00:48:38 +0000 (16:48 -0800)]
am
e9123960: cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
* commit '
e9123960764d7b2e94fb0d68aae21fccc472abcd':
cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
Scott Main [Wed, 15 Dec 2010 00:43:28 +0000 (16:43 -0800)]
am
93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
* commit '
93d204ed98019322e434b714c7c0a619d69f24f5':
cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug:
3258882
Scott Main [Wed, 15 Dec 2010 00:40:39 +0000 (16:40 -0800)]
am
071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
* commit '
071360d1fe5cb75925e5a7ff1b799c5cab160a44':
cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
Scott Main [Wed, 15 Dec 2010 00:22:56 +0000 (16:22 -0800)]
am
b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
* commit '
b94df620959de658990c1ed1263e2e1c42df7f6b':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
Dianne Hackborn [Tue, 14 Dec 2010 22:15:16 +0000 (14:15 -0800)]
am
2bd83c00: Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
* commit '
2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704':
Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"
Dianne Hackborn [Tue, 14 Dec 2010 22:12:37 +0000 (14:12 -0800)]
Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
Dan Morrill [Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)]
am
5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '
5441a9ff2128cf2c5088974c74b79d2d1734f755':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Dan Morrill [Tue, 14 Dec 2010 19:27:20 +0000 (11:27 -0800)]
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
Costin Manolache [Tue, 14 Dec 2010 18:14:10 +0000 (10:14 -0800)]
am
a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '
a848d3445090e114cbfe61f1c7449122a665fba6':
Fix bug in permission grant system.
Costin Manolache [Tue, 14 Dec 2010 18:07:26 +0000 (10:07 -0800)]
Merge "Fix bug in permission grant system." into gingerbread
Roman Nurik [Tue, 14 Dec 2010 03:15:28 +0000 (19:15 -0800)]
am
0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '
0a97435c8d776746bb3dcf16824e2cc81eee20aa':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Roman Nurik [Tue, 14 Dec 2010 03:12:42 +0000 (19:12 -0800)]
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
Brad Fitzpatrick [Mon, 13 Dec 2010 23:27:25 +0000 (15:27 -0800)]
am
0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '
0927c9026537166cec36b2f9bb8a764ef8a7c606':
Fix StrictMode javadoc copy/paste error.
Brad Fitzpatrick [Mon, 13 Dec 2010 23:25:09 +0000 (15:25 -0800)]
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
Nick Kralevich [Mon, 13 Dec 2010 23:05:20 +0000 (15:05 -0800)]
am
9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '
9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
Avoid leaking sockets.
Nick Kralevich [Mon, 13 Dec 2010 23:03:28 +0000 (15:03 -0800)]
Merge "Avoid leaking sockets." into gingerbread
Dianne Hackborn [Mon, 13 Dec 2010 22:37:09 +0000 (14:37 -0800)]
am
e4a59519: Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
* commit '
e4a5951925f16f18dae91ed65567e96528f17fee':
Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:10:23 +0000 (13:10 -0800)]
am
e78a0009: resolved conflicts for merge of
4b94c451 to stage-korg-master
* commit '
e78a000955c283509ee8a21b8b7e448060ac8dd8':
Added dropbox broadcast notification
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)]
resolved conflicts for merge of
4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
Jean-Baptiste Queru [Mon, 13 Dec 2010 20:34:48 +0000 (12:34 -0800)]
Merge "Added dropbox broadcast notification"
Martijn Coenen [Mon, 13 Dec 2010 16:14:01 +0000 (08:14 -0800)]
am
e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit '
e3f6336bcffc250da90ec864bccfa73ad1d016b9':
Fixed API for active NDEF reading and NDEF formatting.
Jeff Hamilton [Sun, 12 Dec 2010 04:58:38 +0000 (20:58 -0800)]
am
641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '
641dd62155fd2eeddd93b2036154b13c05b70ba2':
First pass at advanced NFC tag dispatching APIs and other cleanup.
Martijn Coenen [Sat, 11 Dec 2010 04:40:40 +0000 (20:40 -0800)]
am
b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '
b79173f6602359d00a1a89f4d6505a44d461d796':
Changed technology close() to reconnect to the tag instead of physical disconnect.
Martijn Coenen [Sat, 11 Dec 2010 04:40:34 +0000 (20:40 -0800)]
am
fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '
fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
Changed transceive on all technologies to "raw", except for Mifare classes.
Martijn Coenen [Sat, 11 Dec 2010 04:40:26 +0000 (20:40 -0800)]
am
3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '
3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
Implemented isWritable() to indicate NDEF capability container r/w state.
Nick Pelly [Sat, 11 Dec 2010 01:19:45 +0000 (17:19 -0800)]
am
ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit '
ae56a851624c2b2e78da8a2c339d2caa64c4f981':
Make getSystemService(NFC_SERVICE) the NFC entry point.
Nick Pelly [Sat, 11 Dec 2010 01:18:00 +0000 (17:18 -0800)]
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
Megha Joshi [Fri, 10 Dec 2010 20:33:59 +0000 (12:33 -0800)]
am
7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '
7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
Integrating webinar hosting with developer.android.com
Megha Joshi [Fri, 10 Dec 2010 20:30:35 +0000 (12:30 -0800)]
Merge "Integrating webinar hosting with developer.android.com" into gingerbread
Eric Fischer [Fri, 10 Dec 2010 18:03:55 +0000 (10:03 -0800)]
am
767926bb: Import revised translations. DO NOT MERGE
* commit '
767926bbe90358bc3857f4b78f54c8cdacfb8773':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:37 +0000 (08:49 -0800)]
am
a218e014: reconcile with open-source gingerbread
* commit '
a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
Wink Saville [Thu, 9 Dec 2010 22:02:09 +0000 (14:02 -0800)]
am
d0ffef4b: am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
d0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:58:26 +0000 (13:58 -0800)]
am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Fix for phone app crash in Icc Card."
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:29 +0000 (10:45 -0800)]
am
d9c17cc1: merge from gingerbread
* commit '
d9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:23 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:06 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
Wink Saville [Thu, 9 Dec 2010 05:57:03 +0000 (21:57 -0800)]
am
0a5ae453: am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:53:24 +0000 (21:53 -0800)]
am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:37:38 +0000 (21:37 -0800)]
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
Mathias Agopian [Thu, 9 Dec 2010 00:20:23 +0000 (16:20 -0800)]
am
e1752f41: Merge "fix [
3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '
e1752f41d34249c891564889b07963262b1bd8bf':
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
James Dong [Thu, 9 Dec 2010 00:20:16 +0000 (16:20 -0800)]
am
1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '
1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
Mathias Agopian [Thu, 9 Dec 2010 00:17:02 +0000 (16:17 -0800)]
Merge "fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
Mathias Agopian [Thu, 9 Dec 2010 00:15:08 +0000 (16:15 -0800)]
am
74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '
74da537f80ba36c1279c04fcb85d89fc38c246a6':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
James Dong [Thu, 9 Dec 2010 00:14:27 +0000 (16:14 -0800)]
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 23:34:02 +0000 (15:34 -0800)]
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
Mathias Agopian [Wed, 8 Dec 2010 23:08:33 +0000 (15:08 -0800)]
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
Brad Fitzpatrick [Wed, 8 Dec 2010 21:23:03 +0000 (13:23 -0800)]
am
36af7943: Fix malformed Javadoc.
* commit '
36af79434fb62c26238132eaeda2ec5e732f3c2f':
Fix malformed Javadoc.
Nick Pelly [Wed, 8 Dec 2010 06:57:23 +0000 (22:57 -0800)]
am
40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
* commit '
40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
Nick Pelly [Wed, 8 Dec 2010 06:55:21 +0000 (22:55 -0800)]
Merge "Implemented getSize() to return max ndef size." into gingerbread
Martijn Coenen [Wed, 8 Dec 2010 06:35:01 +0000 (22:35 -0800)]
am
5289b91c: Implement ndef formatting.
* commit '
5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
Wink Saville [Wed, 8 Dec 2010 06:22:01 +0000 (22:22 -0800)]
am
a00d89e8: am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Wink Saville [Wed, 8 Dec 2010 06:18:14 +0000 (22:18 -0800)]
am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Dianne Hackborn [Wed, 8 Dec 2010 06:07:40 +0000 (22:07 -0800)]
am
42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
* commit '
42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
Add more checks for bad values to protect from corrupt files.
Dianne Hackborn [Wed, 8 Dec 2010 06:04:38 +0000 (22:04 -0800)]
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
Wink Saville [Wed, 8 Dec 2010 05:57:53 +0000 (21:57 -0800)]
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
Mathias Agopian [Wed, 8 Dec 2010 05:00:25 +0000 (21:00 -0800)]
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
Mathias Agopian [Tue, 7 Dec 2010 22:22:56 +0000 (14:22 -0800)]
am
a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit '
a2977c383d363e1e88a5b36230b1fa4c312807d2':
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:20:14 +0000 (14:20 -0800)]
am
05813b0e: Merge changes I244b5469,I32044e91 into gingerbread
* commit '
05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:20:09 +0000 (14:20 -0800)]
am
4153bf3a: Merge "[
3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
* commit '
4153bf3a259624a2f2dc497b77b225a1fb517abc':
[
3171580] don't automatically log GraphicBuffer allocation failures
Mathias Agopian [Tue, 7 Dec 2010 22:18:56 +0000 (14:18 -0800)]
Merge changes Ie03796ae,Ide3e980a into gingerbread
* changes:
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:18:21 +0000 (14:18 -0800)]
Merge changes I244b5469,I32044e91 into gingerbread
* changes:
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:17:47 +0000 (14:17 -0800)]
Merge "[
3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
Jeff Hamilton [Tue, 7 Dec 2010 22:04:40 +0000 (14:04 -0800)]
am
0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread
* commit '
0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
Remove Type X Tags from the top-level API.
Daniel Sandler [Tue, 7 Dec 2010 22:01:31 +0000 (14:01 -0800)]
am
f340d082: Merge "More precise status bar battery icons." into gingerbread
* commit '
f340d082b8488de6f131c1e5932cd3abc16b47c1':
More precise status bar battery icons.
Jeff Hamilton [Tue, 7 Dec 2010 21:59:29 +0000 (13:59 -0800)]
Merge "Remove Type X Tags from the top-level API." into gingerbread
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:02:22 +0000 (13:02 -0800)]
am
12902d68: resolved conflicts for merge of
78742e01 to stage-korg-master
* commit '
12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)]
resolved conflicts for merge of
78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
Daniel Sandler [Tue, 7 Dec 2010 20:03:36 +0000 (12:03 -0800)]
Merge "More precise status bar battery icons." into gingerbread
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:01:25 +0000 (12:01 -0800)]
Merge "Strings for NI position request are moved to resources"
Nick Pelly [Tue, 7 Dec 2010 17:34:47 +0000 (09:34 -0800)]
am
47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '
47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
Nick Pelly [Tue, 7 Dec 2010 17:29:21 +0000 (09:29 -0800)]
Merge "Corrected MIFARE default key set" into gingerbread
Chung-yih Wang [Tue, 7 Dec 2010 06:10:29 +0000 (22:10 -0800)]
am
5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '
5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
Chung-yih Wang [Tue, 7 Dec 2010 06:07:59 +0000 (22:07 -0800)]
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
Dirk Dougherty [Tue, 7 Dec 2010 03:44:36 +0000 (19:44 -0800)]
am
0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '
0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
Doc change: fix href to axis_globe_inverted orientation diagram.
Martijn Coenen [Tue, 7 Dec 2010 02:48:02 +0000 (18:48 -0800)]
am
9a9706a2: Added missing ndef technology to getTech.
* commit '
9a9706a213637b396226afff53c69927283609a7':
Added missing ndef technology to getTech.
Nick Pelly [Tue, 7 Dec 2010 02:44:13 +0000 (18:44 -0800)]
am
e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit '
e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
Added NdefFormatable tag, initial class with supported methods.
Nick Pelly [Tue, 7 Dec 2010 02:41:36 +0000 (18:41 -0800)]
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread