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

33849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f128af5346 am dda64e9a: am 51454295: am df9799f0: Fix build. 
* commit 'dda64e9a4af2e7dbc75a3b2fc7c41b9d63848a59':
  Fix build.
 2011-05-12 17:42:14 -07:00
Dianne Hackborn
661b5e1bad am 51454295: am df9799f0: Fix build. 
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
  Fix build.
 2011-05-12 17:39:22 -07:00
Irfan Sheriff
12a7204246 am 91a46046: (-s ours) am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1 
* commit '91a460469a20529938e0f740ce24e0fdaddb7fa6':
  DO NOT MERGE Add DhcpStateMachine
 2011-05-12 17:39:07 -07:00
Irfan Sheriff
6a622ba66a am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1 
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
  DO NOT MERGE Add DhcpStateMachine
 2011-05-12 17:37:06 -07:00
Dianne Hackborn
8fbbfe5bac am df9799f0: Fix build. 
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
  Fix build.
 2011-05-12 17:35:20 -07:00
Irfan Sheriff
eb06280c29 am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge 
* commit '55fa681ac774240509def9d75ad7e16ea5515dd1':
  DO NOT MERGE Define Protocol class
 2011-05-12 17:31:25 -07:00
Jean-Baptiste Queru
ff10dada83 Merge from honeycomb-plus-aosp 
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
 2011-05-12 17:25:33 -07:00
Jean-Baptiste Queru
374e00c9a8 Merge from honeycomb-plus-aosp 
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
 2011-05-12 17:23:41 -07:00
Irfan Sheriff
a4bb9e57a5 Merge commit '01ea7f01' into manualmerge1 2011-05-12 17:19:56 -07:00
Dianne Hackborn
3158e56e9b Merge "resolved conflicts for merge of 0e59729b to master" 2011-05-12 17:15:22 -07:00
John Reck
a41db3722f Merge "Adding functions to query the state of a WebElement." 2011-05-12 17:00:38 -07:00
Chia-chi Yeh
e71c36df7e Merge "Add a method to create ParcelFileDescriptors from DatagramSockets." 2011-05-12 16:55:58 -07:00
Dima Zavin
1d68c8ce9a Merge "update for new audio.h header location" 2011-05-12 16:06:20 -07:00
Irfan Sheriff
fd7d4cf691 am bb09485b: Merge commit \'09564fbb\' into manualmerge 
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class
 2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
194cda3d98 am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia" 
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia
 2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
38b210943c am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop
 2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
6e6afad3f0 am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:52:12 -07:00
Jean-Baptiste Queru
58e19ce8eb am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:52:03 -07:00
Irfan Sheriff
cc13621e36 Merge commit '09564fbb' into manualmerge 2011-05-12 15:47:28 -07:00
Dianne Hackborn
f543d5de23 resolved conflicts for merge of 0e59729b to master 
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
 2011-05-12 15:39:41 -07:00
Jean-Baptiste Queru
d6c51aef6b am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
40951a8cf1 am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
 2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
0e4b2d5826 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
6546fee8cc am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Jean-Baptiste Queru
d698b563da Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Teng-Hui Zhu
094766172f am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
 2011-05-12 15:05:29 -07:00
Dianne Hackborn
d040883030 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
 2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
b9c36527f1 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
 2011-05-12 15:01:56 -07:00
Dianne Hackborn
aef4c4a98f am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
 2011-05-12 15:01:53 -07:00
Chet Haase
3caeb9b176 Merge "Antialiasing for rectangles" 2011-05-12 14:57:51 -07:00
Jean-Baptiste Queru
c97843ba1f Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
fa5f5587ae Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
cc5d30e103 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Irfan Sheriff
a51147adb4 Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00
Irfan Sheriff
a4ae316ca4 Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2 2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
4755b0da13 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Wink Saville
020c4787cc am 9c7c8794: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '9c7c87941446cdd1263a87a8c4cc5672082c7e12':
  Fix initialization of RouteInfo
 2011-05-12 14:08:05 -07:00
Wink Saville
d11e133a4e am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
 2011-05-12 14:03:31 -07:00
Svetoslav Ganov
e9aab723a9 Merge "Propagating hover events to JavaScript in WebView" 2011-05-12 13:43:35 -07:00
Andreas Huber
ab5c0e2a0c Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes." 2011-05-12 13:40:37 -07:00
Wink Saville
adfda25efe Merge "Fix initialization of RouteInfo" into honeycomb-LTE 2011-05-12 13:26:44 -07:00
Andreas Huber
5a05ff998a Merge "The decoder wrapper is no longer needed. Also disable building old-style decoders." 2011-05-12 13:01:29 -07:00
Alex Sakhartchouk
765e65a8db Merge "rsLib cleanup" 2011-05-12 10:15:17 -07:00
Andreas Huber
2988ef907a Merge "Squashed commit of the following:" 2011-05-12 09:29:20 -07:00
Mathias Agopian
0ad71a97c6 fix (Again) adding OES postfix when looking for gl functions 
Change-Id: Ib14723ed5355fdc423226ec20a32e26fe7dd68fe
 2011-05-11 20:37:47 -07:00
Mathias Agopian
8747ce61e9 Merge "add OES postfix without truncating function" 2011-05-11 20:33:43 -07:00
Chia-chi Yeh
12ff0961f6 Merge "Extract NetworkManagementService out from Tethering to ConnectivityService." 2011-05-11 18:33:22 -07:00
Jeff Boody
e647f3c76c add OES postfix without truncating function 
Change-Id: Id47304cf38914190cec58d703801f456ab916f63
 2011-05-11 18:05:49 -07:00
Mathias Agopian
cf46eb9817 fix onFrameAvailable 
Change-Id: I391fe9f6684ac9fd4f91416ce18b583f7087d966
 2011-05-11 18:01:51 -07:00
Mathias Agopian
68c7794183 Add SurfaceTexture logging 
Change-Id: If1b74be5230813fb76429935d88b9d4a7c41700c
 2011-05-11 18:01:51 -07:00