ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
32,163 Commits 2 Branches 0 Tags 54 MiB
098c69629b
Commit Graph

32163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fc182c2c9a am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
  docs: fix the TOC in a few docs
 2011-04-05 14:28:23 -07:00
Scott Main
3bf2275eec am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs
 2011-04-05 14:21:36 -07:00
Adam Powell
9fd2edebe8 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:27:23 -07:00
Adam Powell
7ce2ea95e9 am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:14:27 -07:00
Adam Powell
78b135de42 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Eric Laurent
2c33e89577 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 17:44:50 -07:00
Mike Lockwood
e26dbc56ce am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 17:44:46 -07:00
Trevor Johns
b5ab4f3aa8 am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 17:44:42 -07:00
Simon Wilson
8757f75762 am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 17:44:38 -07:00
Bill Gruber
5baaac6fbb am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
 2011-04-04 17:35:34 -07:00
Bill Gruber
fed3b263c6 am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
 2011-04-04 17:31:23 -07:00
Bill Gruber
24fe32e301 am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
 2011-04-04 17:21:25 -07:00
Bill Gruber
6cba82c9da Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Eric Fischer
ec180cff05 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:43:48 -07:00
Jason parks
a22e688842 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Justin Ho
5d6b9f785d am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
  Updated CDMA roaming icons
 2011-04-04 16:43:23 -07:00
Jean-Baptiste Queru
dc23f67c67 am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':
 2011-04-04 16:43:15 -07:00
Robert Greenwalt
e9e3d1dec2 resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
 2011-04-04 16:26:42 -07:00
Robert Greenwalt
9319fc55df am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
 2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
bb58f515ba am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
c52b5703d1 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
11f34d8880 am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -07:00
Robert Greenwalt
7ed6fe4847 Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-04-04 15:07:41 -07:00
Robert Greenwalt
98bf2c5d1e resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp 
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
 2011-04-04 15:00:13 -07:00
Roman Nurik
5daa25e710 am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
  Document support for .TS video containers.
 2011-04-04 13:47:34 -07:00
Roman Nurik
6c5baca5e1 am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.
 2011-04-04 13:44:23 -07:00
Roman Nurik
5438c1d944 Merge "Document support for .TS video containers." into honeycomb-mr1 2011-04-04 13:41:11 -07:00
Eric Laurent
c873feaefc am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 12:25:37 -07:00
Mike Lockwood
32b372393d am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 12:25:33 -07:00
Trevor Johns
e3b9c61a05 am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'cafbe87d5b6108d71e85950796b587f95d00cfac':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 12:25:29 -07:00
Simon Wilson
42a45d036e am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 12:25:25 -07:00
Eric Fischer
6207a8e760 am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:20:38 -07:00
Jason parks
5c952fc1d3 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Justin Ho
6e8e2655a0 am 87805ca3: Updated CDMA roaming icons 
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
  Updated CDMA roaming icons
 2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
6952674762 am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
 2011-04-04 12:19:26 -07:00
Robert Greenwalt
8e5a5361d3 am 27725e8c: Only leave one default network up at a time. 
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
 2011-04-04 12:18:58 -07:00
Robert Ly
bfba112c17 am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb 
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
  Adding package description for android.hardware.usb
 2011-04-04 11:48:51 -07:00
Robert Ly
f73bad5173 am 3f39f653: Adding package description for android.hardware.usb 
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
  Adding package description for android.hardware.usb
 2011-04-04 11:41:02 -07:00
Robert Greenwalt
eaea127a8b Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-04-04 11:23:51 -07:00
Robert Greenwalt
544de0b31f resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp 
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
 2011-04-04 11:21:23 -07:00
Brad Fitzpatrick
c0c45b0dd0 am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
5e29d67d7c Merge "Fix data corruption when writing to Bluetooth socket" 2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
e40f8ffe51 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
8deedde475 am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
 2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
9f3c59adc5 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
7ac7f79133 Merge "Avoid crash in system server when mounting container" 2011-04-04 09:38:16 -07:00
Dirk Dougherty
bc3afc3053 am 826af857: am f9cdf7fe: Doc change: add diff report for API 12. 
* commit '826af8576b27d18997440bec75daa26434033c0c':
  Doc change: add diff report for API 12.
 2011-04-03 14:06:00 -07:00
Dirk Dougherty
88772c4a44 am f9cdf7fe: Doc change: add diff report for API 12. 
* commit 'f9cdf7feb47aa142e11862f5694c0a29ac013a51':
  Doc change: add diff report for API 12.
 2011-04-03 14:04:20 -07:00
Dirk Dougherty
a2a0d25ab5 am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 
* commit '85709ac8e3340fb8114cfff7128a09d64c06cdc1':
  Doc change: update media formats tables with adts/aac and flac
 2011-04-03 13:56:07 -07:00
Dirk Dougherty
49cbaf290c am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 
* commit '1676920113d35b66e6e8846ffb7dded7e011c2fa':
  Doc change: update media formats tables with adts/aac and flac
 2011-04-03 13:50:48 -07:00