Commit Graph

19842 Commits

Author SHA1 Message Date
Brad Fitzpatrick
4a8dad92bb Merge "DropBox: Read until the end of stream has been reached" 2010-11-16 09:22:31 -08:00
Xia Wang
4f5ba34a57 am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
  Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -08:00
Xia Wang
7da37c0bdd Merge "Add Wi-Fi connection functional tests." into gingerbread 2010-11-16 09:14:46 -08:00
Mathias Agopian
83da32bb74 am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
  Fix a race condition in sensormanager
2010-11-15 13:19:46 -08:00
Mathias Agopian
fc2aa31e63 am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '9e291a4b9922719165145434217e100e2118860d':
  Revert "allow all 4 orientations"
2010-11-15 13:19:43 -08:00
Mathias Agopian
038d998774 Merge "Fix a race condition in sensormanager" into gingerbread 2010-11-15 13:14:59 -08:00
Mathias Agopian
ce6ef64c5b Merge "Revert "allow all 4 orientations"" into gingerbread 2010-11-15 13:14:50 -08:00
Justin Ho
623d4d5251 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.
2010-11-15 09:13:16 -08:00
Justin Ho
d7c7bb65e7 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 2010-11-15 09:10:33 -08:00
Justin Ho
71dd0387c2 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)
2010-11-15 08:53:56 -08:00
Justin Ho
793bd745e3 Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread 2010-11-15 08:50:19 -08:00
Megha Joshi
561c3ae486 am e2ef2c10: Fixing build (DO NOT MERGE)
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
  Fixing build (DO NOT MERGE)
2010-11-12 19:13:35 -08:00
Megha Joshi
602ae138da am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00
Scott Main
e7d586668c 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;
2010-11-11 17:02:54 -08:00
Scott Main
20fd8e71ab 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 2010-11-11 16:56:19 -08:00
Eric Fischer
5cd36d686e am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:49:03 -08:00
Eric Fischer
ed89fde066 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08:00
Mathias Agopian
0a06765508 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
2010-11-11 14:49:35 -08:00
Mathias Agopian
4732dee8a8 Merge "record the last event received regardless of having clients or not" into gingerbread 2010-11-11 14:44:08 -08:00
Scott Main
28ab211dab am dfb12218: docs: revise adding components with info about platform-tools
* commit 'dfb122180c7028764136ac3a4fa07104f601de84':
  docs: revise adding components with info about platform-tools
2010-11-11 11:00:44 -08:00
Amith Yamasani
b92039e82b am db65907a: Merge "Adding pan behavior on preference dialog."
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
  Adding pan behavior on preference dialog.
2010-11-11 09:06:02 -08:00
Amith Yamasani
2d79e36cd1 Merge "Adding pan behavior on preference dialog." 2010-11-11 08:50:52 -08:00
John Wang
6e3ab4c9c4 am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
  Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
b629c885d0 Merge "Fix the audio mode glitch during hangup." into gingerbread 2010-11-10 19:11:20 -08:00
Dianne Hackborn
543ccefc88 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
2010-11-10 18:01:21 -08:00
Dianne Hackborn
bb356a2721 Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:28 -08:00
Jeff Brown
86ec841f92 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)
2010-11-10 16:04:13 -08:00
Jeff Brown
82a517475a Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 2010-11-10 16:00:37 -08:00
Scott Main
bbea7710b7 am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
2010-11-10 14:55:48 -08:00
Scott Main
ee6ceed44a resolved conflicts for merge of 5a726729 to gingerbread
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
Mathias Agopian
a8422af09e 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
2010-11-10 14:15:57 -08:00
Mathias Agopian
70745094cc Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread 2010-11-10 14:09:17 -08:00
Brad Fitzpatrick
3c978c6f67 am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
* commit '9de93424cc05446e3a216f406c55a3937c028416':
  Without SD card the shutdown sequence was delayed
2010-11-10 11:07:18 -08:00
Scott Main
badf9397e3 am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
  docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 10:59:45 -08:00
Brad Fitzpatrick
dfa88ec75b Merge "Without SD card the shutdown sequence was delayed" 2010-11-10 10:58:50 -08:00
Scott Main
cfc1ecf6da Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread 2010-11-10 10:46:36 -08:00
Owen Lin
110d8738e5 am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
Owen Lin
409a974bdd Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00
Mathias Agopian
ddb17b3221 am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
  Improve gyro and accelerometer java doc
2010-11-09 17:24:57 -08:00
Mathias Agopian
4bf9ccb84b Merge "Improve gyro and accelerometer java doc" into gingerbread 2010-11-09 17:12:11 -08:00
David 'Digit' Turner
2346d0223f am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
  Refresh EGL header to work with the NDK
2010-11-09 16:25:58 -08:00
David 'Digit' Turner
3aa9fe0526 Merge "Refresh EGL header to work with the NDK" into gingerbread 2010-11-09 16:12:06 -08:00
Scott Main
fcc532c11b am a784d552: Merge "docs: add release notes for ADT v8" into gingerbread
* commit 'a784d5528f6fa07a48bb7de9dcfa04eb60044927':
  docs: add release notes for ADT v8
2010-11-09 15:34:46 -08:00
Scott Main
24a6729a25 Merge "docs: add release notes for ADT v8" into gingerbread 2010-11-09 15:29:22 -08:00
Mathias Agopian
744026fed6 DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
We just make sure eglGetProcAddress() will return NULL for
 glEGLImageTargetTexture2DOES
 glEGLImageTargetRenderbufferStorageOES

which is better than returning the address of the wrong implementation.

the correct fix is more involved.

Change-Id: I585a1f40e564f862e5dd382224609ccd069cd3b5
2010-11-09 14:41:13 -08:00
Jesse Wilson
6f047ffffe am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '28c742573ccaeb55c16bc02fb25fdd86b8d1f76a':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:17:33 -08:00
Scott Main
154a3d9e99 am 9eb48bb2: Merge "docs: revisions to ndk release notes" into gingerbread
* commit '9eb48bb2b1627ef8182d260f8b3fd080c57bed4d':
  docs: revisions to ndk release notes
2010-11-09 09:35:24 -08:00
Scott Main
2fcbe03d87 Merge "docs: revisions to ndk release notes" into gingerbread 2010-11-09 09:30:30 -08:00
Jeff Hamilton
20aaf81143 am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit '2e2983c6efe0e4223086e4675b715ed0e20e8d26':
  Reduce log clutter.
2010-11-09 06:59:33 -08:00
Jeff Hamilton
b2973f20e8 Merge "Reduce log clutter." into gingerbread 2010-11-09 06:54:51 -08:00