OSDN Git Service
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)]
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:54:49 +0000 (07:54 -0800)]
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
Jean-Baptiste Queru [Wed, 1 Dec 2010 17:47:14 +0000 (09:47 -0800)]
Merge "Fix crash by "adb shell pm list permissions -f|-s""
Jean-Baptiste Queru [Wed, 1 Dec 2010 16:25:12 +0000 (08:25 -0800)]
Merge "Fix HTTP redirect missing statuscode 303 and 307"
Trevor Johns [Thu, 25 Nov 2010 00:23:47 +0000 (16:23 -0800)]
am
210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
* commit '
210e9c4a8b1fdbe9c409f9ce426907587430858a':
Revert "Disabling AccessibilityService sample from build system."
Trevor Johns [Thu, 25 Nov 2010 00:21:16 +0000 (16:21 -0800)]
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
Xia Wang [Wed, 24 Nov 2010 21:29:56 +0000 (13:29 -0800)]
am
c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
* commit '
c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
Xia Wang [Wed, 24 Nov 2010 21:27:53 +0000 (13:27 -0800)]
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
Scott Main [Wed, 24 Nov 2010 20:43:08 +0000 (12:43 -0800)]
am
93116f8f: am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug:
3227820
Scott Main [Wed, 24 Nov 2010 20:39:42 +0000 (12:39 -0800)]
am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug:
3227820
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:14:57 +0000 (11:14 -0800)]
am
f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit '
f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:02:09 +0000 (11:02 -0800)]
Merge "frameworks/base: Destroy the overlay even if there is an error"
Gloria Wang [Tue, 23 Nov 2010 05:26:13 +0000 (21:26 -0800)]
am
4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '
4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
Gloria Wang [Tue, 23 Nov 2010 05:25:56 +0000 (21:25 -0800)]
am
d9334934: Merge "Update of DRM Framework."
* commit '
d93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:15:07 +0000 (21:15 -0800)]
Merge "Notify the playback status to DRM agents before the playback starts"
Gloria Wang [Tue, 23 Nov 2010 05:14:09 +0000 (21:14 -0800)]
Merge "Update of DRM Framework."
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:32:34 +0000 (16:32 -0800)]
resolved conflicts for merge of
e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
Jean-Baptiste Queru [Mon, 22 Nov 2010 23:59:04 +0000 (15:59 -0800)]
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
Xia Wang [Mon, 22 Nov 2010 22:46:33 +0000 (14:46 -0800)]
am
5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '
5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
Xia Wang [Mon, 22 Nov 2010 22:44:49 +0000 (14:44 -0800)]
Merge "Add Wifi Tethering stress test" into gingerbread
Naomi Luis [Thu, 18 Nov 2010 20:48:25 +0000 (12:48 -0800)]
frameworks/base: Destroy the overlay even if there is an error
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
Scott Main [Mon, 22 Nov 2010 21:55:55 +0000 (13:55 -0800)]
am
8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '
8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:44:56 +0000 (13:44 -0800)]
am
b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit '
b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:40:29 +0000 (13:40 -0800)]
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
Dirk Dougherty [Sat, 20 Nov 2010 03:04:56 +0000 (19:04 -0800)]
am
805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '
805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
Dirk Dougherty [Sat, 20 Nov 2010 03:03:03 +0000 (19:03 -0800)]
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
Wu-cheng Li [Sat, 20 Nov 2010 02:17:24 +0000 (18:17 -0800)]
am
589e8381: Merge "Improve camera documentation." into gingerbread
* commit '
589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
Wu-cheng Li [Sat, 20 Nov 2010 02:14:43 +0000 (18:14 -0800)]
Merge "Improve camera documentation." into gingerbread
Mathias Agopian [Sat, 20 Nov 2010 01:20:14 +0000 (17:20 -0800)]
am
927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '
927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
Mathias Agopian [Sat, 20 Nov 2010 01:18:21 +0000 (17:18 -0800)]
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
Scott Main [Sat, 20 Nov 2010 00:51:57 +0000 (16:51 -0800)]
am
828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
* commit '
828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462
Scott Main [Sat, 20 Nov 2010 00:48:50 +0000 (16:48 -0800)]
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:21:31 +0000 (16:21 -0800)]
resolved conflicts for merge of
e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:50:29 +0000 (15:50 -0800)]
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:43:28 +0000 (15:43 -0800)]
am
e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '
e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:31:30 +0000 (15:31 -0800)]
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
Dirk Dougherty [Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)]
am
0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '
0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
Dirk Dougherty [Fri, 19 Nov 2010 18:47:10 +0000 (10:47 -0800)]
Merge "Doc change: update media formats table." into gingerbread
Brad Fitzpatrick [Fri, 19 Nov 2010 18:25:09 +0000 (10:25 -0800)]
am
251384a7: Merge "Improve performance when getting styled string."
* commit '
251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:24:51 +0000 (10:24 -0800)]
am
14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '
14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
Brad Fitzpatrick [Fri, 19 Nov 2010 15:41:39 +0000 (07:41 -0800)]
Merge "Improve performance when getting styled string."
Mathias Agopian [Thu, 18 Nov 2010 23:52:14 +0000 (15:52 -0800)]
am
671a6ff4: Add support for virtual sensors.
* commit '
671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8':
Add support for virtual sensors.
Justin Ho [Thu, 18 Nov 2010 23:06:51 +0000 (15:06 -0800)]
am
80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
* commit '
80381ab4ed44bd69c3e3464a848ca15851365b03':
DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
Justin Ho [Thu, 18 Nov 2010 23:03:39 +0000 (15:03 -0800)]
Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
Jeff Brown [Thu, 18 Nov 2010 20:36:59 +0000 (12:36 -0800)]
am
b27b8c0c: Fix a key repeating bug. (DO NOT MERGE)
* commit '
b27b8c0caf8ff23d10eea655085769f314050427':
Fix a key repeating bug. (DO NOT MERGE)
Jeff Brown [Thu, 18 Nov 2010 20:36:50 +0000 (12:36 -0800)]
am
bfc1cc2d: Fix stuck keys when released out of order. (DO NOT MERGE)
* commit '
bfc1cc2d1ea85cc754e63b422eb8cef8ae6a3667':
Fix stuck keys when released out of order. (DO NOT MERGE)
Jeff Brown [Wed, 3 Nov 2010 00:58:22 +0000 (17:58 -0700)]
Fix a key repeating bug. (DO NOT MERGE)
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.
Repeating keys could also get stuck down.
Bug:
3159581
Bug:
3208156
Change-Id: I1145487cfcc41a7850dba4cafc63c4a5951ace5b
Jeff Brown [Thu, 18 Nov 2010 03:16:52 +0000 (19:16 -0800)]
Fix stuck keys when released out of order. (DO NOT MERGE)
Bug:
3208156
Change-Id: I14e4d54f4912de5e2fabcd8638120623aa2d16e0
Jean-Baptiste Queru [Thu, 18 Nov 2010 02:40:31 +0000 (18:40 -0800)]
Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
Scott Main [Thu, 18 Nov 2010 02:37:50 +0000 (18:37 -0800)]
am
0fe33a48: am
2cbe92ea: docs: add better visibility to app install location doc
* commit '
0fe33a4835ae3721f6302f3f2112d79e43b2b4f6':
docs: add better visibility to app install location doc
Scott Main [Thu, 18 Nov 2010 02:34:40 +0000 (18:34 -0800)]
am
2cbe92ea: docs: add better visibility to app install location doc
* commit '
2cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8':
docs: add better visibility to app install location doc
Jean-Baptiste Queru [Thu, 18 Nov 2010 02:09:08 +0000 (18:09 -0800)]
am
27c06bab: Merge "Release reference when putting RILRequest back into the pool."
* commit '
27c06bab513a1893444d50bb5dedbad5c0100029':
Release reference when putting RILRequest back into the pool.
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:58:14 +0000 (17:58 -0800)]
Merge "Release reference when putting RILRequest back into the pool."
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:56:05 +0000 (17:56 -0800)]
am
d34c1495: Merge "Prevent system crash when OOM in Binder thread."
* commit '
d34c1495020e5d72dd18959fb906375dc0874c04':
Prevent system crash when OOM in Binder thread.
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:56:00 +0000 (17:56 -0800)]
am
11dba787: Merge "Fix build (broken documentation link)"
* commit '
11dba787e10ff5ddc27e834db42acefa33cd35be':
Fix build (broken documentation link)
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:49:19 +0000 (17:49 -0800)]
Merge "Prevent system crash when OOM in Binder thread."
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:41:22 +0000 (17:41 -0800)]
Merge "Fix build (broken documentation link)"
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:29:48 +0000 (17:29 -0800)]
am
a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"
* commit '
a15e4886de8f75f3cb137f51743d330414c910e8':
Framebuffer: Support variable number of framebuffers in the UI
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:16:06 +0000 (17:16 -0800)]
am
09e50cdb: Merge "Reorder lock acquision vs try."
* commit '
09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:15:42 +0000 (17:15 -0800)]
Merge "Framebuffer: Support variable number of framebuffers in the UI"
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:03:10 +0000 (17:03 -0800)]
Merge "Reorder lock acquision vs try."
Jean-Baptiste Queru [Thu, 18 Nov 2010 00:52:55 +0000 (16:52 -0800)]
Merge "resolved conflicts for merge of
8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jean-Baptiste Queru [Thu, 18 Nov 2010 00:47:59 +0000 (16:47 -0800)]
resolved conflicts for merge of
8fc378f9 to gingerbread-plus-aosp
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
Dirk Dougherty [Thu, 18 Nov 2010 00:20:59 +0000 (16:20 -0800)]
am
fc1f5e24: doc change: update uses-feature for gingerbread.
* commit '
fc1f5e24bcd678a08221c8c01a364807edca6daf':
doc change: update uses-feature for gingerbread.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:10:05 +0000 (15:10 -0800)]
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
Dianne Hackborn [Wed, 17 Nov 2010 01:49:07 +0000 (17:49 -0800)]
am
05434e9f: Final API 9. Really! Honestly! I hope.
* commit '
05434e9fa7a6ec844611bbd154c4a3eceafec538':
Final API 9. Really! Honestly! I hope.
Brad Fitzpatrick [Tue, 16 Nov 2010 17:37:56 +0000 (09:37 -0800)]
am
383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '
383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
Brad Fitzpatrick [Tue, 16 Nov 2010 17:22:31 +0000 (09:22 -0800)]
Merge "DropBox: Read until the end of stream has been reached"
Xia Wang [Tue, 16 Nov 2010 17:16:54 +0000 (09:16 -0800)]
am
d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit '
d0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
Add Wi-Fi connection functional tests.
Xia Wang [Tue, 16 Nov 2010 17:14:46 +0000 (09:14 -0800)]
Merge "Add Wi-Fi connection functional tests." into gingerbread
Mathias Agopian [Mon, 15 Nov 2010 21:19:46 +0000 (13:19 -0800)]
am
305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '
305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
Mathias Agopian [Mon, 15 Nov 2010 21:19:43 +0000 (13:19 -0800)]
am
9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '
9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
Mathias Agopian [Mon, 15 Nov 2010 21:14:59 +0000 (13:14 -0800)]
Merge "Fix a race condition in sensormanager" into gingerbread
Mathias Agopian [Mon, 15 Nov 2010 21:14:50 +0000 (13:14 -0800)]
Merge "Revert "allow all 4 orientations"" into gingerbread
Justin Ho [Mon, 15 Nov 2010 17:13:16 +0000 (09:13 -0800)]
am
868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '
868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Justin Ho [Mon, 15 Nov 2010 17:10:33 +0000 (09:10 -0800)]
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
Justin Ho [Mon, 15 Nov 2010 16:53:56 +0000 (08:53 -0800)]
am
a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit '
a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Justin Ho [Mon, 15 Nov 2010 16:50:19 +0000 (08:50 -0800)]
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
Megha Joshi [Sat, 13 Nov 2010 03:13:35 +0000 (19:13 -0800)]
am
e2ef2c10: Fixing build (DO NOT MERGE)
* commit '
e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:46:38 +0000 (18:46 -0800)]
am
48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '
48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
Scott Main [Fri, 12 Nov 2010 01:02:54 +0000 (17:02 -0800)]
am
d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit '
d6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
Scott Main [Fri, 12 Nov 2010 00:56:19 +0000 (16:56 -0800)]
Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
Eric Fischer [Thu, 11 Nov 2010 23:49:03 +0000 (15:49 -0800)]
am
3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3082e5fed04c42301c89de8df36e9d62f0937dec':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:44:04 +0000 (15:44 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Mathias Agopian [Thu, 11 Nov 2010 22:49:35 +0000 (14:49 -0800)]
am
fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
* commit '
fcab475c906da5c159bc56a32c2610f6f55eafd9':
record the last event received regardless of having clients or not
Mathias Agopian [Thu, 11 Nov 2010 22:44:08 +0000 (14:44 -0800)]
Merge "record the last event received regardless of having clients or not" into gingerbread
Scott Main [Thu, 11 Nov 2010 19:00:44 +0000 (11:00 -0800)]
am
dfb12218: docs: revise adding components with info about platform-tools
* commit '
dfb122180c7028764136ac3a4fa07104f601de84':
docs: revise adding components with info about platform-tools
Amith Yamasani [Thu, 11 Nov 2010 17:06:02 +0000 (09:06 -0800)]
am
db65907a: Merge "Adding pan behavior on preference dialog."
* commit '
db65907a2148f053e51f941979f0f7694acd5923':
Adding pan behavior on preference dialog.
Amith Yamasani [Thu, 11 Nov 2010 16:50:52 +0000 (08:50 -0800)]
Merge "Adding pan behavior on preference dialog."
John Wang [Thu, 11 Nov 2010 03:28:31 +0000 (19:28 -0800)]
am
fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit '
fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
Fix the audio mode glitch during hangup.
John Wang [Thu, 11 Nov 2010 03:11:20 +0000 (19:11 -0800)]
Merge "Fix the audio mode glitch during hangup." into gingerbread
Dianne Hackborn [Thu, 11 Nov 2010 02:01:21 +0000 (18:01 -0800)]
am
34594e75: Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '
34594e75e4a7962840f34c0b57116ecf1497f118':
Fix issue #
3177284: Account for wake lock power usage on Crespo
Dianne Hackborn [Thu, 11 Nov 2010 01:58:27 +0000 (17:58 -0800)]
Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
Jeff Brown [Thu, 11 Nov 2010 00:04:13 +0000 (16:04 -0800)]
am
00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
* commit '
00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
Jeff Brown [Thu, 11 Nov 2010 00:00:37 +0000 (16:00 -0800)]
Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
Scott Main [Wed, 10 Nov 2010 22:55:48 +0000 (14:55 -0800)]
am
77f5c954: resolved conflicts for merge of
5a726729 to gingerbread
* commit '
77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
Scott Main [Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)]
resolved conflicts for merge of
5a726729 to gingerbread
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
Mathias Agopian [Wed, 10 Nov 2010 22:15:57 +0000 (14:15 -0800)]
am
17fd21fc: Merge "DO NOT MERGE. workaround [
3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
* commit '
17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [
3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
Mathias Agopian [Wed, 10 Nov 2010 22:09:17 +0000 (14:09 -0800)]
Merge "DO NOT MERGE. workaround [
3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
Brad Fitzpatrick [Wed, 10 Nov 2010 19:07:18 +0000 (11:07 -0800)]
am
9de93424: Merge "Without SD card the shutdown sequence was delayed"
* commit '
9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed