ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,488 Commits 2 Branches 0 Tags 54 MiB
185a0a0420
Commit Graph

41488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Chung
1ef72ab653 am 7f9c1c67: (-s ours) am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit '7f9c1c67ef135a5e7b8226a0003df525adc2593c':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 15:56:36 -08:00
Robert Ly
d51bce7294 am 57e16ed5: am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '57e16ed5f6c254b8b59d1effec2c4a8f3f43eac8':
  docs: adt 15.0.1 rel notes
 2011-11-17 15:56:34 -08:00
Christopher Tate
048315d470 am 7d997121: am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 
* commit '7d9971213ff8fbfd41fa7039300ac28f555f43be':
  Add a few GC-flexing microbenchmark tests
 2011-11-17 15:56:28 -08:00
Jake Hamby
b30f0f9009 am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 
* commit '2084d20668a79e5a31ec7365652434ec943503ef':
  Re-enable vril-dump for adb bugreport.
 2011-11-17 15:56:25 -08:00
Jamie Gennis
f9eed6f949 am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 
* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums
 2011-11-17 15:49:45 -08:00
Jamie Gennis
11f8fde84d Merge "GLES: add image external enums" into ics-mr1 2011-11-17 15:47:28 -08:00
The Android Open Source Project
5faee2c088 am 31b0c687: Reconcile with ics-mr0-release 
* commit '31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12':
 2011-11-17 15:41:03 -08:00
The Android Open Source Project
2c7ae67462 Reconcile with ics-mr0-release 
Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
 2011-11-17 15:36:52 -08:00
Nick Kralevich
fecd4ff808 Merge "Rename EntropyService to EntropyMixer" 2011-11-17 15:30:46 -08:00
Matthew Xie
b16acd28a0 am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
  Check the bluetooth state for getUuid call
 2011-11-17 15:13:03 -08:00
Nick Pelly
1fa578c5df am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.
 2011-11-17 15:12:56 -08:00
David Brown
98019c135c am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1 
* commit '19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
  SIP addresses containing "911" shouldn't be considered emergency calls
 2011-11-17 15:12:54 -08:00
Dave Santoro
2998cb1242 am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
  Unhide social stream permissions.
 2011-11-17 15:12:52 -08:00
Michael Kolb
c0a9a1c232 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
 2011-11-17 15:12:49 -08:00
Jeff Sharkey
8a44dae330 am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
  Only write network stats when already loaded.
 2011-11-17 15:12:45 -08:00
Scott Main
c09c12f9db am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code 
* commit '85c7394836843b2cbfa2b51504448794a6071b3a':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 14:53:51 -08:00
Bill Gruber
fa8e599eb1 am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit 'be0dab485680fb264458f8192b3759b002450102':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 14:53:50 -08:00
Bill Gruber
2cd937ef9a am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit '9d3dffc7b05dbbad4a5e597fa964398b827ba945':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 14:53:48 -08:00
Scott Main
6a97e58718 am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit 'fa847110524512b4bb1cb8e655471d324aba69ff':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 14:53:46 -08:00
Fred Chung
684954cc00 am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit 'c2c77700fbab25bc48002a46a6c0d8a81008030c':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 14:53:45 -08:00
Robert Ly
31fd4eb231 am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '0a2da86346f1f74b66425565e783efb2d5239f25':
  docs: adt 15.0.1 rel notes
 2011-11-17 14:53:43 -08:00
Alex Sakhartchouk
0079a1fb6e Merge "adding benchmark single test" 2011-11-17 14:52:23 -08:00
Scott Main
f72e7fe2f1 am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio 
* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 14:49:36 -08:00
Bill Gruber
9b5b1ad416 am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 14:49:33 -08:00
Bill Gruber
945d90e332 am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 14:49:32 -08:00
Scott Main
bf7d007180 am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 14:49:28 -08:00
Fred Chung
411c492fbe am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 14:49:26 -08:00
Robert Ly
ee1d590384 am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes
 2011-11-17 14:49:21 -08:00
Christopher Tate
607af13930 am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 
* commit '4cf1656e10514d0575304d5a8108bc7a0b7384ed':
  Add a few GC-flexing microbenchmark tests
 2011-11-17 14:45:26 -08:00
Christopher Tate
0585366699 Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 2011-11-17 14:43:17 -08:00
Glenn Kasten
dfea21d357 Merge "Bug 5522189 re-enable ARM opts but disable inline" 2011-11-17 14:08:31 -08:00
Jamie Gennis
9f43009177 EGL: fix blob cache extension detection 
Bug: 5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
 2011-11-17 14:06:46 -08:00
Jake Hamby
3169c98e9e am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 
* commit '0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
  Re-enable vril-dump for adb bugreport.
 2011-11-17 13:55:29 -08:00
Jake Hamby
43691af572 Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 2011-11-17 13:53:17 -08:00
Amith Yamasani
5466d0f3c1 am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit '664bb774f528fead63d7c0e62b533da66390b246':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 13:20:22 -08:00
Fred Chung
6e5b8287be am a8f7b7c4: am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit 'a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 13:20:19 -08:00
Andreas Huber
04c8c5cabe am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 13:20:16 -08:00
John Reck
e74aa129a3 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
 2011-11-17 13:20:15 -08:00
John Reck
b8c14d9db5 am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
 2011-11-17 13:20:12 -08:00
Matthew Xie
f20c359327 am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
  Check the bluetooth state for getUuid call
 2011-11-17 13:12:39 -08:00
Matthew Xie
a26d0e3ad2 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
 2011-11-17 13:10:14 -08:00
Nick Pelly
637742c34e am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.
 2011-11-17 12:51:18 -08:00
Nick Pelly
3d1e8f0610 Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
David Brown
c1bb1bc364 am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1 
* commit '1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
  SIP addresses containing "911" shouldn't be considered emergency calls
 2011-11-17 12:35:26 -08:00
David Brown
2a9e6ac317 Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1 2011-11-17 12:33:00 -08:00
Scott Main
f278e6fdf7 Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0 2011-11-17 12:32:11 -08:00
Dave Santoro
e16f48b126 am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.
 2011-11-17 12:27:44 -08:00
Dave Santoro
52afa59ed0 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
0b596f3383 am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
 2011-11-17 12:25:06 -08:00
Michael Kolb
60508814e0 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00