ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,370 Commits 2 Branches 0 Tags 54 MiB
79eed1e191
Commit Graph

30370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
d95f6454a3 am e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb 
* commit 'e49f75eb4634f8ee70ad0b5fbd8c6ea19773024f':
  Fix struct initializer for balls.
 2011-02-11 16:49:48 -08:00
Roman Nurik
a19c563c3b am 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 
* commit '471f89cc8666f484c5a609503f16d806b8c716f0':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
 2011-02-11 16:47:34 -08:00
Stephen Hines
2d917c1675 am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb 
* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
  Fix struct initializer for balls.
 2011-02-11 16:47:04 -08:00
Roman Nurik
cbc11b7a74 am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 
* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
 2011-02-11 16:44:52 -08:00
Stephen Hines
906bb20fa7 Merge "Fix struct initializer for balls." into honeycomb 2011-02-11 16:44:49 -08:00
Roman Nurik
afb5dda2f2 Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 2011-02-11 16:43:32 -08:00
Robert Ly
4ab58a4754 am 154e849b: am ccea5d27: Doc change: tools, adt, ndk release notes 
* commit '154e849b72f6c71ee4c996b6dc67a46e7f8703df':
  Doc change: tools, adt, ndk release notes
 2011-02-11 16:31:59 -08:00
Robert Ly
6163399831 am ccea5d27: Doc change: tools, adt, ndk release notes 
* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
  Doc change: tools, adt, ndk release notes
 2011-02-11 16:30:15 -08:00
Yu Shan Emily Lau
25a17435d0 Merge "Add the open source test media contents." 2011-02-11 16:16:06 -08:00
Jesse Wilson
9837a4c99d Merge "Add a new method, LruCache.remove" 2011-02-11 15:56:15 -08:00
Roman Nurik
c21d04a03a am d822438f: am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code. 
* commit 'd822438fa7fcc23df3a240a65ad4ba1fe6fe7cc7':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
 2011-02-11 15:44:46 -08:00
Roman Nurik
595abee860 am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code. 
* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
 2011-02-11 15:42:57 -08:00
James Dong
155fb47d4f Merge "Make available h263 DSI information from MPEG4Extractor" 2011-02-11 15:38:20 -08:00
Adam Cohen
7c4bd5e906 am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb 
* commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4':
  Adding StackWidget sample code
 2011-02-11 15:29:43 -08:00
Winson Chung
6e6329a132 am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb 
* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'
 2011-02-11 15:29:35 -08:00
Adam Cohen
4956b09d6b am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb 
* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
  Adding StackWidget sample code
 2011-02-11 15:23:27 -08:00
Adam Cohen
dd8df9a233 Merge "Adding StackWidget sample code" into honeycomb 2011-02-11 15:19:38 -08:00
Basavapatna Dattaguru
c009320b0d Merge "Video Editor CTS Test Code: annotation suppress" 2011-02-11 15:17:06 -08:00
Winson Chung
bff6b07797 am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb 
* commit '5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'
 2011-02-11 15:15:33 -08:00
Basavapatna Dattaguru
4c5a49e5ae Merge "VideoEditor Test contents: Issue ID:3396697" 2011-02-11 15:08:28 -08:00
Winson Chung
d25f3d54db Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb 2011-02-11 15:07:06 -08:00
Eric Laurent
dabb87dd40 Merge "Fix issue 3425342." 2011-02-11 14:48:20 -08:00
Robert Ly
2a95bdbe1a am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp 
* commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79':
  Doc change: nfc dev guide
 2011-02-11 14:02:00 -08:00
Xia Wang
c9dd8a8479 Merge "Fix test3GToWifiNotification for mobile state validation." 2011-02-11 13:55:44 -08:00
Andreas Huber
4ec372d0cc Merge "Start playing (and decoding) audio only after the first video frame has been decoded." 2011-02-11 13:50:12 -08:00
Robert Ly
120a181976 resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp 
Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
 2011-02-11 13:49:09 -08:00
Robert Ly
e3fd2631d6 am 6059bb3e: am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb 
* commit '6059bb3e24bf47c3bfd805c887775db817d537e7':
  Doc change: updating animation framework topic
 2011-02-11 13:21:47 -08:00
Robert Ly
666820aa38 am 41d34195: am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb 
* commit '41d34195f9d0c6a1548bb9c0de27a8cfd147210f':
  Doc change: renderscript dev guide
 2011-02-11 13:21:44 -08:00
Robert Ly
7e67e8bdfc am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb 
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
  Doc change: updating animation framework topic
 2011-02-11 13:18:41 -08:00
Robert Ly
be46db59f1 am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb 
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
  Doc change: renderscript dev guide
 2011-02-11 13:18:33 -08:00
Robert Ly
6619488871 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Robert Ly
b7425b51b5 Merge "Doc change: updating animation framework topic" into honeycomb 2011-02-11 13:15:55 -08:00
Robert Ly
5e349a4031 Merge "Doc change: renderscript dev guide" into honeycomb 2011-02-11 13:15:35 -08:00
Jesse Wilson
d976e33cad Merge "Remove LruCache.setMaxSize()." 2011-02-11 12:45:29 -08:00
James Dong
908589d3fa am d24d00ae: am f9e7442a: Update sample code in documentation 
* commit 'd24d00ae1c0eaa20ec9f8581be4baba723ea4a00':
  Update sample code in documentation
 2011-02-11 12:00:14 -08:00
James Dong
6a4db29916 am f9e7442a: Update sample code in documentation 
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
  Update sample code in documentation
 2011-02-11 11:56:33 -08:00
Robert Greenwalt
f839ac7050 Merge "Update LinkProperties treatment of gateways" 2011-02-11 11:38:44 -08:00
Dheeraj Sharma
64ca6180c2 Merge "Fix for issue : 3439708 Last frame is missing effect" 2011-02-11 10:57:31 -08:00
Amith Yamasani
d78fb43bb1 Merge "Fix over-eager locking of volume dialog's primary stream." 2011-02-11 10:42:56 -08:00
Jean-Baptiste Queru
0d65146bac am 0ba97e3f: am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" 
* commit '0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc':
  stubs
 2011-02-11 10:33:58 -08:00
Jean-Baptiste Queru
6f436ed2b9 am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" 
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs
 2011-02-11 10:16:45 -08:00
Jean-Baptiste Queru
fd32f41763 am 6901f963: am 93552de8: Merge "stubs" 
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
 2011-02-11 10:04:53 -08:00
Leon Scroggins
7c5e2fc15b Merge "Do not show the dropdown unless there is something to show." 2011-02-11 09:58:05 -08:00
Jean-Baptiste Queru
a240734bae am 93552de8: Merge "stubs" 
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
 2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0 stubs 
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
 2011-02-11 09:33:40 -08:00
Mike Lockwood
8a8cfd12ae Merge "MTP: Fix JNI warnings in MtpDevice" 2011-02-11 05:21:26 -08:00
Chih-Chung Chang
f315ad80c9 Merge "Fix a bug that the condition for play/pause was reversed." 2011-02-10 19:23:52 -08:00
Jesse Wilson
fe9a9a1a22 Merge "Adopt LRU cache in SQLite." 2011-02-10 18:28:44 -08:00
Adam Powell
579f10c1f9 Merge "Fix bug 2955651 - can open normal menu during action modes" 2011-02-10 18:25:06 -08:00