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

30215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
5e1a7d6a19 am cc47600d: am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit 'cc47600d4d7850f2903d2d59cc7f44528d40c8e5':
  Document NFC permissions.
 2011-02-10 13:56:46 -08:00
Jeff Hamilton
1c6af4a189 am 510ced64: am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '510ced64f4316702cea07a55d1d473bdc07b2c86':
  Improve the docs a bit for foreground dispatch.
 2011-02-10 13:56:41 -08:00
Eric Fischer
0daa3f9035 am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
  Import revised translations.  DO NOT MERGE
 2011-02-10 13:56:36 -08:00
Scott Main
45db4ff7c9 am 51d94b26: am 129c7372: am 3c01a139: rename SIP doc title 
* commit '51d94b268a63d0ffffce92aa7cb822ae99529d84':
  rename SIP doc title
 2011-02-10 13:56:29 -08:00
Nick Pelly
6f1ae086a9 am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.
 2011-02-10 13:52:34 -08:00
Jeff Hamilton
165c1ad42f am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
  Improve the docs a bit for foreground dispatch.
 2011-02-10 13:52:23 -08:00
Scott Main
f8535bf802 am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
  docs: move the SIP guide into guide/network/
 2011-02-10 13:51:30 -08:00
Eric Fischer
0c365669ad am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
  Import revised translations.  DO NOT MERGE
 2011-02-10 13:50:51 -08:00
Scott Main
22201fb079 am 129c7372: am 3c01a139: rename SIP doc title 
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title
 2011-02-10 13:50:44 -08:00
Scott Main
81363d359f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
 2011-02-10 13:47:32 -08:00
Jesse Wilson
4be44052c0 Merge "Remove SSLPerformanceTest and DatabaseSessionCache." 2011-02-10 13:44:56 -08:00
Katie McCormick
8952156b4b am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-10 13:03:27 -08:00
Xavier Ducrohet
00c662cbdf Merge "LayoutLib: remove some exceptions." 2011-02-10 13:01:34 -08:00
Katie McCormick
b91f20af98 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
 2011-02-10 12:38:07 -08:00
Andreas Huber
277b95db21 Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Marco Nelissen
937eb81ec9 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Steve Block
a137e211c2 Merge "Increase DRT timeout while waiting for WebView to dump as text" 2011-02-10 12:13:27 -08:00
Adam Powell
11a21bff64 Merge "Fix bug 3440372 - Spinner measurement issues with new rules" 2011-02-10 12:07:38 -08:00
Andreas Huber
71a2cbd8b4 Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
John Reck
ef0c9cb3bf Merge "Fix spacing issue" 2011-02-10 11:53:10 -08:00
Xavier Ducrohet
d8d6552230 Merge "LayoutLib: Annotate the custom delegate methods." 2011-02-10 11:27:27 -08:00
Santosh Madhava
3cb3346451 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00
Chet Haase
be11adb0df Merge "Fix animation and layoutTransition issues." 2011-02-10 09:16:56 -08:00
Cary Clark
404740d9ec Merge "only allow dpad center for key long press" 2011-02-09 17:15:10 -08:00
Steve Block
6f95982168 Merge "Remove LayoutTest http/tests/xmlhttprequest/simple-cross-origin-progress-events.html from skipped list" 2011-02-09 16:37:34 -08:00
Xavier Ducrohet
f630f42a88 Merge "LayoutLib: now depends on tools-common-prebuilt." 2011-02-09 16:27:27 -08:00
Cary Clark
07de04862b Merge "move selectAll to match framework" 2011-02-09 16:05:13 -08:00
James Dong
402d32b6fa Merge "Reduce blocking time in file write" 2011-02-09 16:04:14 -08:00
Patrick Scott
57d1302339 Merge "Call window.onscroll event at the end of scrolling." 2011-02-09 15:44:21 -08:00
Alex Sakhartchouk
7e8fdf0b83 am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb 
* commit '85bccf6e0b555bc5245628ba7340123b6b367b51':
  DO NOT MERGE Removing an activity that shouldn't go into samples
 2011-02-09 15:27:34 -08:00
Dirk Dougherty
2d44573064 am e05bd9ee: am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb 
* commit 'e05bd9ee7f800ca4350a8c8b94bcfdab1f9e8217':
  Doc change: add diff report for API 11
 2011-02-09 15:25:28 -08:00
Alex Sakhartchouk
31e6d2e0d3 am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb 
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples
 2011-02-09 15:23:54 -08:00
Dirk Dougherty
257497d912 am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb 
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
  Doc change: add diff report for API 11
 2011-02-09 15:21:49 -08:00
Alex Sakhartchouk
65bcbcc831 Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb 2011-02-09 15:20:21 -08:00
Dirk Dougherty
4917dbf6a5 Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
2dd3fe8584 am e1109753: am fefa95a9: Doc change: Add version notes for Android 2.3.3. 
* commit 'e110975368a26637793db7079d1ba6c4a2806056':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-09 14:23:00 -08:00
Dirk Dougherty
094217876b am fefa95a9: Doc change: Add version notes for Android 2.3.3. 
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-09 14:20:06 -08:00
James Dong
4ff57c79f8 Merge "Catch read error from AudioRecord and do not assert" 2011-02-09 13:58:06 -08:00
Vasu Nori
fd26125ce7 Merge "turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed" 2011-02-09 13:34:43 -08:00
Mathias Agopian
e28fe54e7a am bfe9e9cf: am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 
* commit 'bfe9e9cf18ca84214bc59d875d74ca63a27e2414':
  fix [3374821] Cannot take screenshot of HC preview
 2011-02-09 13:27:01 -08:00
Mathias Agopian
42ebf195b2 am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
  fix [3374821] Cannot take screenshot of HC preview
 2011-02-09 13:22:46 -08:00
Mathias Agopian
5d90264a79 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Glenn Kasten
686bb3f6a4 Merge "Bug 3438513 Fix incorrect throws clause" 2011-02-09 13:08:00 -08:00
Dirk Dougherty
94f6064919 am bf5cde2f: am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit 'bf5cde2f7112b53e5b237e7275267caef25c789d':
  Doc change: Add diff report for api 10.
 2011-02-09 12:22:26 -08:00
Gilles Debunne
9256ea6339 am 54afc818: am 63bd55c7: am cdfe8999: Fix for multiple merge problem. 
* commit '54afc818afa2d3ffe525e35ecdfc421c6fa862f3':
  Fix for multiple merge problem.
 2011-02-09 12:22:23 -08:00
Dirk Dougherty
93457e74e9 am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
  Doc change: Add diff report for api 10.
 2011-02-09 12:19:54 -08:00
Gilles Debunne
78fd484d9b am 63bd55c7: am cdfe8999: Fix for multiple merge problem. 
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.
 2011-02-09 12:19:46 -08:00
Svetoslav Ganov
31474719f7 Merge "Added tests for WebView accessibility no JS" 2011-02-09 11:14:43 -08:00
Eric Fischer
6f851b003f am c3e3cc3d: (-s ours) am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:52:11 -08:00
Eric Fischer
b14ac99db7 am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:47:47 -08:00