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

32776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
82881420f0 am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:46:38 -07:00
Jason parks
d66f55e1f7 am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Justin Ho
4f9dabb61d am d95fa2ff: am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit 'd95fa2ff8cf7cc302dab5de0f1becf67bd298898':
  Updated CDMA roaming icons
 2011-04-04 16:46:31 -07:00
Jean-Baptiste Queru
0e35493791 am e2fbd0a9: am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':
 2011-04-04 16:46:29 -07:00
Robert Greenwalt
f4af360d11 am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
  Only leave one default network up at a time.
 2011-04-04 16:44:25 -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
Chet Haase
691a02566f Merge "Fix bug with values in cloned animators." 2011-04-04 16:27:38 -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
6f8798744e am da8beef5: am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit 'da8beef55612738d87d6aa520445377a9e4ae784':
  Fix Default route after secondary net use.
 2011-04-04 15:28:56 -07:00
Brad Fitzpatrick
c6335654db am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:28:54 -07:00
Brad Fitzpatrick
118dfc93d4 am e511fb33: am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit 'e511fb33d33f0ba83ce437f615fa236f369b5ade':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:28:51 -07:00
Brad Fitzpatrick
a72f719083 am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit '8f7aad147d790b25bae7301827e070df72690341':
  Avoid crash in system server when mounting container
 2011-04-04 15:28:48 -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
05505014c4 am 549177e4: Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '549177e4f3f5e2a92e1431c157cebb985068a5ee':
  Fix bad merge.
 2011-04-04 15:12:13 -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
Alex Sakhartchouk
4fbddaadc3 Merge "First draft of fbo in renderscript. Updating samples and benchmark" 2011-04-04 14:33:19 -07:00
Gilles Debunne
d1ecae2804 Merge "IME is no longer shown when an EditText gets focus." 2011-04-04 14:25:45 -07:00
Roman Nurik
38c0829b6d am 84967294: am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '84967294f25d223ff2c5e62378b40f20fd853c4c':
  Document support for .TS video containers.
 2011-04-04 13:51:18 -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
Elliott Hughes
10ffd8d611 Merge "You can't fsync(2) /dev/urandom..." 2011-04-04 12:55:58 -07:00
Andreas Huber
cd4e79b166 Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491" 2011-04-04 12:45:23 -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
Adam Cohen
458c89ec88 Merge "Fixing build" 2011-04-04 12:12:25 -07:00
Andreas Huber
1e8cc7b1f1 Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock." 2011-04-04 12:00:20 -07:00
Robert Ly
2df1d33f68 am cbfeda13: am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb 
* commit 'cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
  Adding package description for android.hardware.usb
 2011-04-04 11:55:23 -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
Adam Cohen
aa996ca3ea Merge "Making StackView res-out and click feedback colors stylable" 2011-04-04 11:27:07 -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
974e21c066 am 9e374cf4: am 826af857: am f9cdf7fe: Doc change: add diff report for API 12. 
* commit '9e374cf4941c18059ce47b5eba9ace08d06f57b0':
  Doc change: add diff report for API 12.
 2011-04-03 14:07:49 -07:00