Commit Graph

32163 Commits

Author SHA1 Message Date
Wink Saville
c35acb7faf am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:13:22 -07:00
Wink Saville
7e0531e7ab Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
600bbc5667 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:02:58 -07:00
Mike Lockwood
dcc1d18101 am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -07:00
Mike Lockwood
00aace4934 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
Andreas Huber
0e4a59ea2c am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:26:21 -07:00
Brad Fitzpatrick
7dba70e98f am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Andreas Huber
9de7d2bb83 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -07:00
Brad Fitzpatrick
587b9dc7b6 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
199f567fc7 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -07:00
Andreas Huber
1689095fc5 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Brad Fitzpatrick
a57bf3d09b Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Wink Saville
bf9c5db48a am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
2011-03-26 16:52:53 -07:00
Wink Saville
b5bfa6fcbf am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
2011-03-26 16:51:13 -07:00
Wink Saville
dd767313f9 Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00
Wink Saville
bbeec2416e Merge "Add some debug to apn list creation routines." into honeycomb-LTE 2011-03-26 16:48:35 -07:00
Ramesh Sudini
5d7baa8926 am fbe284b6: Telephony: Fix eHRPD Service State Mapping.
* commit 'fbe284b6756b44819e9f4d13938bad06b238d112':
  Telephony: Fix eHRPD Service State Mapping.
2011-03-26 09:23:23 -07:00
Robert Greenwalt
f9a75b96bd Merge "Fix Default route after secondary net use." into gingerbread 2011-03-26 08:58:01 -07:00
Dirk Dougherty
5b22cde5cc am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '79da5c2da018a2066b7e5d6e8de0c03d00c20492':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:27:18 -07:00
Dirk Dougherty
16b0d813eb am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:25:45 -07:00
Dirk Dougherty
f0da05a075 am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:22:55 -07:00
Nick Pelly
5c0652d4f3 am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '14923862577ef785d20fc5c627248897c9eaddb6':
  NfcAdapterExtras: reset singleton state if initialization fails.
2011-03-25 15:51:42 -07:00
Andreas Huber
254b763c97 am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit '2fee96bcc057d9b5a9ac912af79fd838f5a42964':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:40:56 -07:00
Andreas Huber
636a44a11a am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:38:34 -07:00
Andreas Huber
8c46bc35a6 Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 2011-03-25 15:33:58 -07:00
Jeff Hamilton
fbf4a75c57 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Adam Powell
1c83f574ce am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:49:11 -07:00
Adam Powell
c99c6d3544 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:45:06 -07:00
Irfan Sheriff
fce4eab91a Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
James Dong
cdfb20ceb5 am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
  Switch to use SF cached source
2011-03-25 10:27:05 -07:00
James Dong
f518993012 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
2011-03-25 10:24:44 -07:00
James Dong
c613ed429e Merge "Switch to use SF cached source" into honeycomb-mr1 2011-03-25 10:22:57 -07:00
Gloria Wang
9deed0123f am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:09:09 -07:00
Gloria Wang
3c2c14bad9 am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:05:50 -07:00
Gloria Wang
9111ab8d91 Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 2011-03-25 10:01:37 -07:00
Robert Greenwalt
9028577960 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Jeff Hamilton
618cfd6e85 am 9c1ef098: Update the value for the NFC shared UID.
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
2011-03-24 20:21:41 -07:00
Scott Main
95ce7a252d am f54972d0: am cc4b6a61: am 4045e6b9: docs: a11y doc typo
* commit 'f54972d06006ae73c88811d4a2db00d4919a1c16':
  docs: a11y doc typo
2011-03-24 14:17:16 -07:00
Scott Main
2a6b3af87b am cc4b6a61: am 4045e6b9: docs: a11y doc typo
* commit 'cc4b6a61c6df67c211ac85d49f457fd562abf142':
  docs: a11y doc typo
2011-03-24 14:11:39 -07:00
Scott Main
39ced64baa am 4045e6b9: docs: a11y doc typo
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
  docs: a11y doc typo
2011-03-24 14:00:47 -07:00
Scott Main
5ade1065ee am c55a6eed: am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
* commit 'c55a6eed2587f642b2c12ed65f85def7f62d6339':
  docs: fix a few things in a11y doc
2011-03-24 12:31:02 -07:00
Scott Main
96fcbb6431 am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
* commit '119e79cf2763592389b4543612400d746bb9aeb2':
  docs: fix a few things in a11y doc
2011-03-24 12:29:24 -07:00
Scott Main
2accd81522 am e0b3f2a7: docs: fix a few things in a11y doc
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
  docs: fix a few things in a11y doc
2011-03-24 12:26:58 -07:00
Scott Main
fbb463da20 am e8eb0f73: am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit 'e8eb0f732111ff660b36365365fab21c685e1d6b':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:56:49 -07:00
Scott Main
22bb60049e am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit '95cb883c066b754a96c899b48bd487e2ad0f213d':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:54:08 -07:00
Scott Main
1ba7e63c5b am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit 'b7cfa72932fbb3c794c6e5509b4a5b716236f558':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:51:50 -07:00
Scott Main
94a11356ca Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 2011-03-24 10:49:59 -07:00
Gloria Wang
15e14b312d am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit '480edfb9e0c90ae1ae970a1e5e09640db112803e':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 10:43:44 -07:00
Gloria Wang
d8776379e7 am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 10:42:14 -07:00
Gloria Wang
0d7705ebbe Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 2011-03-24 10:40:26 -07:00