OSDN Git Service
The Android Open Source Project [Thu, 5 Jan 2012 20:13:22 +0000 (12:13 -0800)]
The Android Open Source Project [Thu, 5 Jan 2012 20:08:48 +0000 (12:08 -0800)]
am
d32ee5ba: Reconcile with ics-mr1-release
* commit '
d32ee5baa057992431263907ec5cf8f19b43c043':
Robert Greenwalt [Thu, 5 Jan 2012 19:41:16 +0000 (11:41 -0800)]
am
32350c7a: Merge "Filter our v6 address from tethering dns."
* commit '
32350c7ab2f56b6d70437ba62f85232fd0b2c24a':
Filter our v6 address from tethering dns.
Robert Greenwalt [Thu, 5 Jan 2012 19:39:26 +0000 (11:39 -0800)]
Merge "Filter our v6 address from tethering dns."
Alex Sakhartchouk [Thu, 5 Jan 2012 17:29:41 +0000 (09:29 -0800)]
Merge "Adding light script to scenegraph. Patching up the collada parser to handle data from different converters." into graphics-dev
Glenn Kasten [Thu, 5 Jan 2012 16:21:37 +0000 (08:21 -0800)]
am
6b14d585: Merge "Remove the notion of "active track" from mixer"
* commit '
6b14d5858056d49d2cd2162cd043908794e5a4df':
Remove the notion of "active track" from mixer
Glenn Kasten [Thu, 5 Jan 2012 16:20:10 +0000 (08:20 -0800)]
Merge "Remove the notion of "active track" from mixer"
The Android Open Source Project [Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
Glenn Kasten [Thu, 5 Jan 2012 15:40:36 +0000 (07:40 -0800)]
am
a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
* commit '
a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
Use the standard CC_LIKELY and CC_UNLIKELY macros
Glenn Kasten [Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)]
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
Glenn Kasten [Thu, 15 Dec 2011 17:51:17 +0000 (09:51 -0800)]
Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose. So rename the private
uses to use the standard names.
In addition, AudioFlinger was relying on the macro expanding to extra ( ).
Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
Wink Saville [Thu, 5 Jan 2012 05:55:03 +0000 (21:55 -0800)]
am
9a03482c: am
3ed28036: am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
9a03482c66b2f5c30c7fde38216239a1f233df02':
Enhancement on ICS data stall polling logic
Wink Saville [Thu, 5 Jan 2012 05:55:00 +0000 (21:55 -0800)]
am
efd617e0: am
0ad96f89: am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
efd617e01f8c22a69fa6d458883933f059e43491':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Thu, 5 Jan 2012 05:54:57 +0000 (21:54 -0800)]
am
7da207b5: am
a3534ad4: am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
7da207b574f1281792dcd7022467180d24438315':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Thu, 5 Jan 2012 05:54:55 +0000 (21:54 -0800)]
am
39f05540: am
875b6992: (-s ours) am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
39f05540988775fa44c5ca6a535bf329889b8720':
Do not allow file:// access when it is disabled. Do not merge.
Wink Saville [Thu, 5 Jan 2012 05:52:13 +0000 (21:52 -0800)]
am
3ed28036: am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
3ed2803691cc271fe6b893dc46d49fca2fce61df':
Enhancement on ICS data stall polling logic
Wink Saville [Thu, 5 Jan 2012 05:52:10 +0000 (21:52 -0800)]
am
0ad96f89: am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
0ad96f89401920486b68d8404f6a143870d57500':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Thu, 5 Jan 2012 05:52:06 +0000 (21:52 -0800)]
am
a3534ad4: am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Thu, 5 Jan 2012 05:52:04 +0000 (21:52 -0800)]
am
875b6992: (-s ours) am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
875b69928193e464243cf491bfe861f30644e9b4':
Do not allow file:// access when it is disabled. Do not merge.
Eric Laurent [Thu, 5 Jan 2012 01:47:37 +0000 (17:47 -0800)]
am
dc8627e7: resolved conflicts for merge of
1a4b9939 to master
* commit '
dc8627e7dcd019ec328878b1f7855890d39ed0ab':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)]
resolved conflicts for merge of
1a4b9939 to master
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
Alex Sakhartchouk [Thu, 5 Jan 2012 00:59:41 +0000 (16:59 -0800)]
Merge "Adding better error behavior to RS" into graphics-dev
Alex Sakhartchouk [Thu, 5 Jan 2012 00:59:16 +0000 (16:59 -0800)]
Merge "Adding RS comments, cleaning up the gl implementation with new Element hal." into graphics-dev
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:55:28 +0000 (13:55 -0800)]
am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
c697ebfdd671c7f4cf338d601917de16d2f1f135':
Enhancement on ICS data stall polling logic
Wink Saville [Wed, 4 Jan 2012 21:53:25 +0000 (13:53 -0800)]
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:51:59 +0000 (13:51 -0800)]
am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
d4d35168129d544f62cee7e1f83c5bf15d9f291d':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Wed, 4 Jan 2012 21:50:04 +0000 (13:50 -0800)]
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:49:37 +0000 (13:49 -0800)]
am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
c97d0e43bacdae735071d6d7026175fbc4bdafca':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Wed, 4 Jan 2012 21:49:34 +0000 (13:49 -0800)]
am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
705665acda5fec6c8c76683b2e5850b0bd447449':
Do not allow file:// access when it is disabled. Do not merge.
Wink Saville [Wed, 4 Jan 2012 21:47:55 +0000 (13:47 -0800)]
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
Bart Sears [Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)]
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
Eric Laurent [Wed, 4 Jan 2012 21:00:49 +0000 (13:00 -0800)]
am
fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit '
fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Wed, 4 Jan 2012 20:58:17 +0000 (12:58 -0800)]
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
Siva Velusamy [Wed, 4 Jan 2012 20:54:20 +0000 (12:54 -0800)]
am
157fea64: gltrace: add user settings to control data captured.
* commit '
157fea642cb4c10e44a61f932c68f7c3a2610a81':
gltrace: add user settings to control data captured.
Siva Velusamy [Wed, 4 Jan 2012 20:52:02 +0000 (12:52 -0800)]
am
193b4597: Merge "gltrace: add start time & duration to each traced call."
* commit '
193b45970e512e99b4557fe4bbb30b2dca30320f':
gltrace: add start time & duration to each traced call.
Siva Velusamy [Tue, 3 Jan 2012 22:39:31 +0000 (14:39 -0800)]
gltrace: add user settings to control data captured.
Currently users do not have control over the amount of data
captured during tracing. This patch adds 3 settings that users
can enable/disable at runtime:
- capture framebuffer on eglSwap() calls
- capture framebuffer on glDraw*() calls
- capture texture data passed to glTexImage*() calls
Disabling these options when not needed signficantly decreases
the size of the trace file, and reduces performance overhead for
the running application.
These settings are stored in the per process GLTraceState.
A separate thread listens for commands from the host, and updates
the state based on the user commands.
Change-Id: Ic4518b94e8bcbc5330ac7138153721caa98b365d
Siva Velusamy [Wed, 4 Jan 2012 20:49:46 +0000 (12:49 -0800)]
am
974a1660: Merge "gltrace: transport buffering and context management"
* commit '
974a166022a67bd4e808bb788d44f5cc84039332':
gltrace: transport buffering and context management
Siva Velusamy [Wed, 4 Jan 2012 20:48:52 +0000 (12:48 -0800)]
Merge "gltrace: add start time & duration to each traced call."
Siva Velusamy [Wed, 4 Jan 2012 20:47:29 +0000 (12:47 -0800)]
Merge "gltrace: transport buffering and context management"
Scott Main [Wed, 4 Jan 2012 20:05:33 +0000 (12:05 -0800)]
am
16a21720: am
319c3bcb: am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
16a21720d904f7078e0375d517869b336a019069':
docs: add Teleepoch VID/driver info and update Huawei url
Scott Main [Wed, 4 Jan 2012 20:03:22 +0000 (12:03 -0800)]
am
319c3bcb: am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
319c3bcbb1b0163040984e263b5b16005f81adba':
docs: add Teleepoch VID/driver info and update Huawei url
Scott Main [Wed, 4 Jan 2012 20:01:02 +0000 (12:01 -0800)]
am
c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit '
c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
docs: add Teleepoch VID/driver info and update Huawei url
Siva Velusamy [Fri, 16 Dec 2011 01:32:05 +0000 (17:32 -0800)]
gltrace: add start time & duration to each traced call.
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
Siva Velusamy [Wed, 14 Dec 2011 20:19:56 +0000 (12:19 -0800)]
gltrace: transport buffering and context management
This patch adds two improvements:
1. Protobuf messages are buffered and sent in chunks.
2. Multiple EGL contexts are handled properly: Corresponding
to each EGLContext, a GLTraceContext with a unique ID is created.
On eglMakeCurrent, the appropriate GLTraceContext is set and is
used while tracing subsequent GL Calls in that thread.
Change-Id: I34076376d3e5af205c87c7396ea47659844abd6e
Siva Velusamy [Wed, 4 Jan 2012 19:20:54 +0000 (11:20 -0800)]
am
efc12654: Merge "gltrace: attach contents of the appropriate framebuffer"
* commit '
efc1265402512303a9cf88b7ddd796e92df7857b':
gltrace: attach contents of the appropriate framebuffer
Siva Velusamy [Wed, 4 Jan 2012 19:18:29 +0000 (11:18 -0800)]
Merge "gltrace: attach contents of the appropriate framebuffer"
John Reck [Wed, 4 Jan 2012 18:53:56 +0000 (10:53 -0800)]
am
c9c76a82: Merge "Fix Apache stack"
* commit '
c9c76a82c6d0bf2362044d899013832882f32c94':
Fix Apache stack
John Reck [Wed, 4 Jan 2012 18:52:35 +0000 (10:52 -0800)]
Merge "Fix Apache stack"
Steve Block [Wed, 4 Jan 2012 18:16:14 +0000 (10:16 -0800)]
am
41891aea: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
* commit '
41891aeaf4e6e4006ae3087fa537786e9ec8caa4':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Steve Block [Wed, 4 Jan 2012 18:13:13 +0000 (10:13 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
Jesse Wilson [Wed, 4 Jan 2012 16:24:40 +0000 (08:24 -0800)]
am
7c48707a: Merge "Explicitly specify \'milliseconds\' as alarm manager\'s time unit."
* commit '
7c48707a9d320230452d5937239f28ab0ea2e695':
Explicitly specify 'milliseconds' as alarm manager's time unit.
Jesse Wilson [Wed, 4 Jan 2012 16:22:36 +0000 (08:22 -0800)]
Merge "Explicitly specify 'milliseconds' as alarm manager's time unit."
Steve Block [Wed, 4 Jan 2012 13:39:13 +0000 (05:39 -0800)]
am
7b061309: Merge "Fix AppCache when either no path or an invalid path is supplied"
* commit '
7b061309fabb6fdf9e40a48dd4feaac6ffa29710':
Fix AppCache when either no path or an invalid path is supplied
Steve Block [Wed, 4 Jan 2012 13:36:57 +0000 (05:36 -0800)]
Merge "Fix AppCache when either no path or an invalid path is supplied"
Elliott Hughes [Wed, 4 Jan 2012 02:55:49 +0000 (18:55 -0800)]
am
b4f7bbc5: Merge "Fix Music import for Turkish locales."
* commit '
b4f7bbc57c17375a75e5128ae84842b38b550c46':
Fix Music import for Turkish locales.
Elliott Hughes [Wed, 4 Jan 2012 02:54:27 +0000 (18:54 -0800)]
Merge "Fix Music import for Turkish locales."
Christopher Tate [Wed, 4 Jan 2012 01:46:20 +0000 (17:46 -0800)]
am
20eaf4c1: am
91582b86: am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
20eaf4c1a41ee56998086769122917b016181630':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:44:09 +0000 (17:44 -0800)]
am
91582b86: am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
91582b86d918b80158654671933cf26c96c34747':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:40:53 +0000 (17:40 -0800)]
am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Scott Main [Wed, 4 Jan 2012 00:34:25 +0000 (16:34 -0800)]
am
1ad47b47: am
f65320a2: am
12d9954d: docs: dasboard update for 1/3/12
* commit '
1ad47b47bcd9f399db91e633e264a0d40a9948a3':
docs: dasboard update for 1/3/12
Romain Guy [Wed, 4 Jan 2012 00:34:23 +0000 (16:34 -0800)]
am
173ab4d6: Merge "Properly restore the GL scissor after a GL draw functor Bug #
5781254"
* commit '
173ab4d61077c49f115b82eff34f97fda5a7273a':
Properly restore the GL scissor after a GL draw functor Bug #
5781254
Danielle Millett [Wed, 4 Jan 2012 00:34:19 +0000 (16:34 -0800)]
am
3c673732: Merge "Fix
5783857: Device Policy Manager doesn\'t allow Face Unlock"
* commit '
3c673732ead2721c564c2bd46780e8ebf10e948b':
Fix
5783857: Device Policy Manager doesn't allow Face Unlock
Brian Colonna [Wed, 4 Jan 2012 00:34:17 +0000 (16:34 -0800)]
am
dd13756f: Merge "Added padding to PIN layout status and carrier text"
* commit '
dd13756fdcfe3b254ef052b3c983a9bc28ba5520':
Added padding to PIN layout status and carrier text
Brian Colonna [Wed, 4 Jan 2012 00:34:15 +0000 (16:34 -0800)]
am
edcac2aa: Merge "Unbinding from FU when going to backup"
* commit '
edcac2aa695b2cd774ecc8deaa78c363b227b45b':
Unbinding from FU when going to backup
Scott Main [Wed, 4 Jan 2012 00:00:28 +0000 (16:00 -0800)]
am
f65320a2: am
12d9954d: docs: dasboard update for 1/3/12
* commit '
f65320a2743e81ae1cb62f2dbf60b65a122b9ddb':
docs: dasboard update for 1/3/12
Scott Main [Tue, 3 Jan 2012 23:58:41 +0000 (15:58 -0800)]
am
12d9954d: docs: dasboard update for 1/3/12
* commit '
12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Romain Guy [Tue, 3 Jan 2012 22:21:18 +0000 (14:21 -0800)]
Merge "Properly restore the GL scissor after a GL draw functor Bug #
5781254"
Danielle Millett [Tue, 3 Jan 2012 21:44:28 +0000 (13:44 -0800)]
Merge "Fix
5783857: Device Policy Manager doesn't allow Face Unlock"
Brian Colonna [Tue, 3 Jan 2012 21:43:07 +0000 (13:43 -0800)]
Merge "Added padding to PIN layout status and carrier text"
Brian Colonna [Tue, 3 Jan 2012 21:42:17 +0000 (13:42 -0800)]
Merge "Unbinding from FU when going to backup"
Jeff Sharkey [Tue, 3 Jan 2012 18:59:12 +0000 (10:59 -0800)]
am
b8f90a0e: Merge "Test the correct return code from call to cryptfs."
* commit '
b8f90a0e6eae582778bbe10b6347acbf5fc69bfb':
Test the correct return code from call to cryptfs.
Jeff Sharkey [Tue, 3 Jan 2012 18:57:19 +0000 (10:57 -0800)]
Merge "Test the correct return code from call to cryptfs."
Dirk Dougherty [Tue, 3 Jan 2012 18:39:52 +0000 (10:39 -0800)]
am
478e45be: am
27d2a07a: am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
478e45be576a08567333e4846ee80de11acfdfb6':
Doc change: fix link target for "Publish" icon.
Dirk Dougherty [Tue, 3 Jan 2012 18:37:48 +0000 (10:37 -0800)]
am
27d2a07a: am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
27d2a07a5548e238863135280b706751764ef20f':
Doc change: fix link target for "Publish" icon.
Dirk Dougherty [Tue, 3 Jan 2012 18:35:18 +0000 (10:35 -0800)]
am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
Ben Murdoch [Tue, 3 Jan 2012 10:56:27 +0000 (02:56 -0800)]
am
2853041e: Merge "Do not allow file:// access when it is disabled."
* commit '
2853041e6a5b848824a4e518a5d41cb334855302':
Do not allow file:// access when it is disabled.
Ben Murdoch [Tue, 3 Jan 2012 10:53:58 +0000 (02:53 -0800)]
Merge "Do not allow file:// access when it is disabled."
Wink Saville [Fri, 30 Dec 2011 00:43:21 +0000 (16:43 -0800)]
am
e7f2cafc: Merge "Separate SIM states from Radio states"
* commit '
e7f2cafc172e0671a40e46ce86107c50d884af1f':
Separate SIM states from Radio states
Wink Saville [Fri, 30 Dec 2011 00:41:09 +0000 (16:41 -0800)]
Merge "Separate SIM states from Radio states"
Eric Fischer [Thu, 29 Dec 2011 22:48:30 +0000 (14:48 -0800)]
am
40da0486: Merge "Import revised translations."
* commit '
40da0486f88ff64a0b8a101764cf551503407634':
Import revised translations.
Eric Fischer [Thu, 29 Dec 2011 22:46:50 +0000 (14:46 -0800)]
Merge "Import revised translations."
Irfan Sheriff [Thu, 29 Dec 2011 17:13:31 +0000 (09:13 -0800)]
am
7db0d041: Merge "Add multi-interface support to native calls"
* commit '
7db0d0411266e29302aadfe1f64209628c586a93':
Add multi-interface support to native calls
Irfan Sheriff [Thu, 29 Dec 2011 17:11:29 +0000 (09:11 -0800)]
Merge "Add multi-interface support to native calls"
Chia-chi Yeh [Wed, 28 Dec 2011 23:16:41 +0000 (15:16 -0800)]
am
a650639d: Merge "SipService: grab Wi-Fi lock only when necessary."
* commit '
a650639d5bddf13e949c8ff9d2d14f9e16afc571':
SipService: grab Wi-Fi lock only when necessary.
Chia-chi Yeh [Wed, 28 Dec 2011 23:14:23 +0000 (15:14 -0800)]
Merge "SipService: grab Wi-Fi lock only when necessary."
Irfan Sheriff [Wed, 28 Dec 2011 21:57:38 +0000 (13:57 -0800)]
am
2f0d941b: Merge "clean up jni code"
* commit '
2f0d941b5df25e2dc857daad445bc69e1e1129d2':
clean up jni code
Irfan Sheriff [Wed, 28 Dec 2011 21:55:19 +0000 (13:55 -0800)]
Merge "clean up jni code"
Scott Main [Wed, 28 Dec 2011 18:38:01 +0000 (10:38 -0800)]
am
085ab36c: am
e231cd0a: am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
085ab36cc9d8f0bf102572d69d13f62497f32a90':
docs: add links for Galaxy Nexus driver
Scott Main [Wed, 28 Dec 2011 18:36:01 +0000 (10:36 -0800)]
am
e231cd0a: am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
e231cd0a0dd5fce60a0635d7a60233db432429dd':
docs: add links for Galaxy Nexus driver
Scott Main [Wed, 28 Dec 2011 18:34:03 +0000 (10:34 -0800)]
am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
Jesse Wilson [Wed, 28 Dec 2011 00:43:58 +0000 (16:43 -0800)]
am
2ae509b5: Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
* commit '
2ae509b58a88df9c57cff9a67eefc661a856a04e':
Move the frameworks/base hostname verifier into libcore. Part 2/2
Jesse Wilson [Wed, 28 Dec 2011 00:42:24 +0000 (16:42 -0800)]
Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
Chia-chi Yeh [Tue, 27 Dec 2011 21:45:40 +0000 (13:45 -0800)]
am
c1bac3a6: VPN: fix a CloseGuard warning.
* commit '
c1bac3a6e240c1c9a14a7b515f585977fb908930':
VPN: fix a CloseGuard warning.
Alex Sakhartchouk [Tue, 27 Dec 2011 17:04:40 +0000 (09:04 -0800)]
Merge "Missing getter and additional tests." into graphics-dev
Alex Sakhartchouk [Tue, 27 Dec 2011 17:03:38 +0000 (09:03 -0800)]
Merge "Adding tests for element/mesh getters. Fixing bugs found by tests." into graphics-dev
Joe Fernandez [Fri, 23 Dec 2011 00:01:48 +0000 (16:01 -0800)]
am
2b072677: am
201469f5: am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
2b072677538de979961b5bf527109fdab1713731':
docs: Add developer guide cross-references, Project ACRE, round 4
Joe Fernandez [Thu, 22 Dec 2011 23:59:34 +0000 (15:59 -0800)]
am
201469f5: am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
OSDN Git Service
