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

32689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
1ca13de1af Merge "Support primitive ALT-TAB style navigation using Recent Apps." 2011-03-30 02:33:44 -07:00
Brian Carlstrom
873c8dafbe Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)" 2011-03-29 22:35:40 -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
Romain Guy
1aed2e3e0b Merge "Move the drawable state to the correct class. Bug #4170455" 2011-03-29 18:33:12 -07:00
Wink Saville
d1790f627a am 8a395624: am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 
* commit '8a395624042ed06732703c4e272ad416a45ecf10':
  Cleanup DataConnectionTracker
 2011-03-29 17:00:11 -07:00
Eric Fischer
b6d2b82685 am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
  Import revised translations.  DO NOT MERGE
 2011-03-29 16:59:35 -07:00
Eric Fischer
848b96b841 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-03-29 16:59:31 -07:00
Teng-Hui Zhu
c8e2f02ef7 Merge "Add the loading progress UI when buffering" 2011-03-29 16:58:19 -07:00
Amith Yamasani
f04c7cb8cd am 342f38f9: am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit '342f38f9a95e26b20ebaaac6402409beb9ba96f8':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 16:58:16 -07:00
Christopher Tate
cf88963bb2 Merge "Add view/drawable states for drag-accepting / drag-hovered" 2011-03-29 16:49:46 -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
Dmitry Shmidt
b484ff5edd Merge "bugreport: Add ping wlan gateway, dns1 and dns2 servers" 2011-03-29 16:28:00 -07:00
Jeff Brown
0ff61b259d Merge "Support chorded fallback keys." 2011-03-29 16:19:46 -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
James Dong
46cd8cac6c Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc" 2011-03-29 15:17:47 -07:00
Marco Nelissen
b454f1a52a Merge "Fix media scanner uri handling." 2011-03-29 15:16:55 -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
Eric Fischer
270c1a567d am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:07:14 -07:00
Amith Yamasani
533b7eb13c am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:06:29 -07:00
Amith Yamasani
e509e5e805 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 2011-03-29 13:55:19 -07:00
The Android Open Source Project
1a1b70fbfa Merge from gingerbread 
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
 2011-03-29 13:54:43 -07:00
Andreas Huber
0621746347 Merge "Add a user-agent header to our RTSP requests." 2011-03-29 13:52:15 -07:00
Eric Fischer
e138d6753f Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-03-29 13:45:03 -07:00
Michael I. Gold
894c1459c1 egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-03-29 13:43:54 -07:00
Eino-Ville Talvala
2e2132d773 Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream." 2011-03-29 13:34:03 -07:00
Andreas Huber
343b539281 Merge "Adding support for the '.mxmf' MIDI file extension." 2011-03-29 13:33:58 -07:00
Bart Sears
a129d4434f am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-29 13:23:55 -07:00
Huahui Wu
b8f4d6d997 am 97621525: (-s ours) am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE 
* commit '97621525c54057550dc40b38dcbe03de70cadd87':
  DO NOT MERGE
 2011-03-29 13:23:52 -07:00
Bart Sears
5116244797 am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-29 13:19:07 -07:00
Huahui Wu
ec3a0e5ef6 am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE 
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
  DO NOT MERGE
 2011-03-29 13:19:01 -07:00
Eric Fischer
c2cb14c6c0 am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:30:12 -07:00
Eric Fischer
711b114c19 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:27:29 -07:00
Andreas Huber
ccec7a73a4 Merge "Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread." 2011-03-29 12:23:34 -07:00
Eric Fischer
b358e1c9e4 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:20:42 -07:00
Eric Fischer
09f54780c0 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-29 12:16:53 -07:00
David Li
214c31dbe5 Merge "GLES2Dbg: use 256KB chunks for lzf compression" 2011-03-29 12:00:07 -07:00
Amith Yamasani
a0ab9784ec Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" 2011-03-29 10:46:59 -07:00
Brad Fitzpatrick
eb797b1fd5 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
13e41db3a1 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
12c059e903 am fae5e289: am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit 'fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-29 08:53:48 -07:00
Brad Fitzpatrick
5608d20a33 am 8ef609ab: am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit '8ef609abe56c9872c93fc304037d1e52d4475e5e':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-29 08:53:38 -07:00
Brad Fitzpatrick
6462cb9ca7 am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
daf1df6b4e am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-29 08:45:20 -07:00
Bill Gruber
92864d200a am 67a249d6: am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch 
* commit '67a249d607e029650104ca71373b09b852614725':
  IAB doc update for final launch
 2011-03-29 00:12:49 -07:00