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

32182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
154616f763 am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 
* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
  Telephony: Update LTE RILConstants to match ril.h
 2011-03-31 10:26:12 -07:00
Wink Saville
37a6515a76 Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 2011-03-31 10:23:11 -07:00
Dianne Hackborn
f98821724c am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit 'a5b308e74c44722b9414fa9be52eabacd23029b2':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:53:44 -07:00
Dianne Hackborn
6d31dc83b4 am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:50:29 -07:00
Dianne Hackborn
32005bd7c6 Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Justin Ho
50ce790103 am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 16:00:50 -07:00
Justin Ho
667fe67ba0 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 15:59:19 -07:00
Justin Ho
cf98fbf9ce Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 2011-03-30 15:57:42 -07:00
Trevor Johns
5ee2e9289c am f829305f: am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'f829305f8706e32fa103e5ee9eef7c595642d1a2':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:30:56 -07:00
Trevor Johns
6fb9cf809b am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:29:10 -07:00
Trevor Johns
25844ed7ea am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:26:38 -07:00
Andreas Huber
c3fdf9b816 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:22:57 -07:00
Andreas Huber
0a398b8fe3 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:19:46 -07:00
Jeff Hamilton
37aaa96f40 am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 15:18:30 -07:00
Irfan Sheriff
b57cb5bfb7 am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 15:18:23 -07:00
Andreas Huber
b08b9e8ef5 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Robert Greenwalt
8be27ca06c Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-30 15:08:27 -07:00
Robert Greenwalt
6799c31658 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp 
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
 2011-03-30 15:03:13 -07:00
Eric Laurent
ce75529174 Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 2011-03-30 14:55:49 -07:00
Eric Fischer
8f301a19e6 am acf48255: am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'acf48255aa3706489839948f153615e5c5cf38cb':
  Import revised translations.  DO NOT MERGE
 2011-03-30 14:46:44 -07:00
Eric Fischer
fc30ab2fd8 am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '91c482b2351db1221308fe90800b8ef8bddbed90':
  Import revised translations.  DO NOT MERGE
 2011-03-30 14:42:30 -07:00
Eric Fischer
5cdc24e380 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-30 14:39:25 -07:00
Mike Lockwood
6de2e32fd3 Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13 Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3 Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 2011-03-30 13:26:45 -07:00
Scott Main
445b70f4eb am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5c35c05909640768bbe7f1ecef3165382825c31b':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:13:59 -07:00
Scott Main
9742d26c3f am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:12:15 -07:00
Scott Main
d3f76e9527 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00
Eric Fischer
8ee2f9df92 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-30 10:41:05 -07:00
Andreas Huber
6f25ac9922 am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:34:15 -07:00
Jeff Hamilton
105d6527dd am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 09:30:40 -07:00
Irfan Sheriff
51af9642fd am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 09:30:32 -07:00
Robert Greenwalt
4f90fda71f am 568845a7: Merge "Fix some alt-network issues." into gingerbread 
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
 2011-03-30 09:30:15 -07:00
Andreas Huber
c56993bd05 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Andreas Huber
afb643d62c Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 2011-03-30 09:12:04 -07:00
The Android Open Source Project
a72cc20564 am 5e1383f2: am ad663d80: Merge from gingerbread 
* commit '5e1383f25782e553294bca387f3c072073416416':
  egl: fixes for object refcounts
 2011-03-30 08:21:29 -07:00
Brad Fitzpatrick
2f28c6d362 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Brad Fitzpatrick
495ff4a370 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
Brad Fitzpatrick
cd2b0eefcf am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
 2011-03-30 08:20:51 -07:00
Jason parks
00607ddaee Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Mike Lockwood
78dc1a184e am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:17:36 -07:00
Mike Lockwood
80c12241b1 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:16:17 -07:00
Mike Lockwood
9870439c00 Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 2011-03-29 22:14:27 -07:00
Jeff Hamilton
1ad210d328 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
The Android Open Source Project
db14ee1cc2 am ad663d80: Merge from gingerbread 
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
 2011-03-29 15:23:08 -07:00
Wink Saville
91b0466585 am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
  Cleanup DataConnectionTracker
 2011-03-29 15:12:22 -07:00
Wink Saville
2e7c89b84a Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 2011-03-29 14:44:56 -07:00
Eric Fischer
00743cc67f am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:19:51 -07:00
Eric Fischer
2ffee604fa am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:15:22 -07:00
Amith Yamasani
2bd70ca87e am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:10:32 -07:00