OSDN Git Service
George Mount [Mon, 23 Jan 2012 15:30:26 +0000 (07:30 -0800)]
Merge "Add cut and paste to ContentEditable."
Michael Jurka [Mon, 23 Jan 2012 15:24:32 +0000 (07:24 -0800)]
Merge "Remove fastInvalidate and setFast* methods"
Michael Jurka [Mon, 23 Jan 2012 15:23:56 +0000 (07:23 -0800)]
Merge "Improve rapid-fire presses on system bar"
Dianne Hackborn [Sat, 21 Jan 2012 02:42:07 +0000 (18:42 -0800)]
resolved conflicts for merge of
892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
Christopher Tate [Sat, 21 Jan 2012 01:59:06 +0000 (17:59 -0800)]
Merge "Fix shared-storage full backup"
Glenn Kasten [Sat, 21 Jan 2012 01:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
Guang Zhu [Sat, 21 Jan 2012 01:06:42 +0000 (17:06 -0800)]
Merge "Revert "Use port 18000 instead of 8000 for layout tests""
Daniel Sandler [Sat, 21 Jan 2012 00:38:24 +0000 (16:38 -0800)]
am
a64f899f: am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
a64f899fa6159a8839a769d3f107f6c502da58c8':
Always show appropriate mobile service label.
Jeff Brown [Sat, 21 Jan 2012 00:38:10 +0000 (16:38 -0800)]
am
1bc82792: (-s ours) am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Sat, 21 Jan 2012 00:38:07 +0000 (16:38 -0800)]
am
06a0fb95: (-s ours) am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
The Android Open Source Project [Sat, 21 Jan 2012 00:38:02 +0000 (16:38 -0800)]
am
288cde7f: Reconcile with ics-mr1-release
* commit '
288cde7f0a17f47f7071168f442d19f703947cc9':
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:52 +0000 (16:37 -0800)]
am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:25:45 +0000 (16:25 -0800)]
am
fd266b36: (-s ours) am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
fd266b36826aa6dd8cd3fa00c159a094423899fb':
Rename (IF_)LOG() to (IF_)ALOG()
Justin Ho [Sat, 21 Jan 2012 00:23:03 +0000 (16:23 -0800)]
am
abc90a7b: (-s ours) am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
abc90a7b48b058379a50a426bd0d2769ac7229b6':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Jeff Brown [Sat, 21 Jan 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Delete dead code."
Wink Saville [Fri, 20 Jan 2012 23:56:56 +0000 (15:56 -0800)]
Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
Robert Ly [Fri, 20 Jan 2012 23:52:32 +0000 (15:52 -0800)]
am
cdc1ea03: am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
5d0c713a: Reconcile with ics-mr1-release
* commit '
5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
Robert Ly [Fri, 20 Jan 2012 23:52:07 +0000 (15:52 -0800)]
am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
docs: wifi direct
Jim Miller [Fri, 20 Jan 2012 23:48:21 +0000 (15:48 -0800)]
am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
ab9601cdbb95ae94088750eff9a926a572c1a4d6':
Fix
5863053: Add method to lock screen immediately.
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Robert Greenwalt [Fri, 20 Jan 2012 22:35:41 +0000 (14:35 -0800)]
Merge "Stop using shared DUN APN when tethering stops."
Eino-Ville Talvala [Fri, 20 Jan 2012 22:32:22 +0000 (14:32 -0800)]
Merge "Add ANativeWindow timestamp support to camera service."
Robert Greenwalt [Fri, 20 Jan 2012 22:24:15 +0000 (14:24 -0800)]
Merge "Log netd traffic nicely."
Jeff Brown [Fri, 20 Jan 2012 22:07:59 +0000 (14:07 -0800)]
Merge "Initialize SQLite as part of the android runtime."
Gilles Debunne [Fri, 20 Jan 2012 22:06:19 +0000 (14:06 -0800)]
Merge "Touch moves cursor in text refactored"
Andreas Huber [Fri, 20 Jan 2012 21:43:39 +0000 (13:43 -0800)]
Merge "Starhub RTSP apparently does not establish time on all tracks"
Glenn Kasten [Fri, 20 Jan 2012 20:16:06 +0000 (12:16 -0800)]
Merge "Fix typos in string constants"
Glenn Kasten [Fri, 20 Jan 2012 20:15:38 +0000 (12:15 -0800)]
Merge "Remove dead file include/media/thread_init.h"
Glenn Kasten [Fri, 20 Jan 2012 20:14:32 +0000 (12:14 -0800)]
Merge "Remove redundant get()"
Dianne Hackborn [Fri, 20 Jan 2012 20:03:47 +0000 (12:03 -0800)]
am
1bae8066: Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
* commit '
1bae80668cc1d12bb4a4b93bce1960b2601de131':
Fix issue #
5823276 again: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 20 Jan 2012 20:01:51 +0000 (12:01 -0800)]
Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Daniel Sandler [Fri, 20 Jan 2012 19:31:10 +0000 (11:31 -0800)]
am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
Daniel Sandler [Fri, 20 Jan 2012 19:28:44 +0000 (11:28 -0800)]
Merge "Always show appropriate mobile service label." into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:26:46 +0000 (11:26 -0800)]
am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:26:43 +0000 (11:26 -0800)]
am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
5d58eb06bcc8671bae72fb2389a9929e106131cc':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:24:13 +0000 (11:24 -0800)]
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
Gilles Debunne [Fri, 20 Jan 2012 18:27:10 +0000 (10:27 -0800)]
Merge "AOOB in AutoComplete"
Gilles Debunne [Fri, 20 Jan 2012 18:27:00 +0000 (10:27 -0800)]
Merge "Make sure text selection always starts"
The Android Open Source Project [Fri, 20 Jan 2012 18:25:28 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
Glenn Kasten [Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)]
Merge "Remove dead setRingerMode(mode, mask)"
Glenn Kasten [Fri, 20 Jan 2012 16:32:45 +0000 (08:32 -0800)]
Merge "Fix build warning for void * arithmetic"
Pin Ting [Fri, 20 Jan 2012 09:37:12 +0000 (01:37 -0800)]
Merge "Fixes some javadoc."
Jeff Brown [Fri, 20 Jan 2012 03:54:16 +0000 (19:54 -0800)]
Merge "Don't need to link to libsqlite from media JNI library."
Jeff Brown [Fri, 20 Jan 2012 03:54:05 +0000 (19:54 -0800)]
Merge "Clean up SQLiteDebug natives."
Jeff Brown [Fri, 20 Jan 2012 03:53:38 +0000 (19:53 -0800)]
Merge "Remove custom SQLITE_UNCLOSED error code."
James Dong [Fri, 20 Jan 2012 02:53:27 +0000 (18:53 -0800)]
Merge "Remove obsolete TODO comments"
Romain Guy [Fri, 20 Jan 2012 02:16:11 +0000 (18:16 -0800)]
Merge "Fix build"
Romain Guy [Fri, 20 Jan 2012 01:42:10 +0000 (17:42 -0800)]
Merge "Remove unused code"
Romain Guy [Fri, 20 Jan 2012 01:34:26 +0000 (17:34 -0800)]
Merge "Deprecate unused APIs"
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:34 +0000 (17:28 -0800)]
am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:30 +0000 (17:28 -0800)]
am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
12b7da69957ef894ce5134989e38479c64308ea1':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:26 +0000 (17:28 -0800)]
am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
f3f650db96d40014a0203393c585c368b0dd7a9a':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:22 +0000 (17:28 -0800)]
am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:18 +0000 (17:28 -0800)]
am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
7ae84204c14b4abff70fcc19c3c33de2591df34b':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:16 +0000 (17:26 -0800)]
am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:12 +0000 (17:26 -0800)]
am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:08 +0000 (17:26 -0800)]
am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:03 +0000 (17:26 -0800)]
am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:25:58 +0000 (17:25 -0800)]
am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:20:58 +0000 (17:20 -0800)]
am
97aa8ee8: Merge
ee4618bc
* commit '
97aa8ee81198234aedffceaf71ad216b96323393':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:18:25 +0000 (17:18 -0800)]
Merge
ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:02:27 +0000 (17:02 -0800)]
am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
36b48c30adf7236b00eccf87f3b5691359526540':
Rename (IF_)LOG() to (IF_)ALOG()
Jean-Baptiste Queru [Fri, 20 Jan 2012 00:59:41 +0000 (16:59 -0800)]
am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
The Android Automerger [Fri, 20 Jan 2012 00:28:56 +0000 (16:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 19 Jan 2012 23:44:53 +0000 (15:44 -0800)]
am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
820b45c0a21980a43532b9fb9823f8aa08c64a15':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Justin Ho [Thu, 19 Jan 2012 23:43:19 +0000 (15:43 -0800)]
Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:34 +0000 (14:47 -0800)]
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:22 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:09 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:54 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:39 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:24 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"
Steve Block [Mon, 9 Jan 2012 18:35:44 +0000 (18:35 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:41:56 +0000 (14:41 -0800)]
Merge "Rename (IF_)LOG() to (IF_)ALOG()"
Andreas Huber [Thu, 19 Jan 2012 22:40:44 +0000 (14:40 -0800)]
Merge "Make sure the ThrottledSource reports the proper mime type"
Jeff Brown [Thu, 19 Jan 2012 22:19:28 +0000 (14:19 -0800)]
Merge "Remove no longer needed EventHub usleep() optimization."
Jeff Brown [Thu, 19 Jan 2012 22:11:47 +0000 (14:11 -0800)]
Merge "Fix line wrapping."
Jeff Brown [Thu, 19 Jan 2012 22:05:39 +0000 (14:05 -0800)]
Merge "Clean up SQLite debugging code."
Robert Ly [Thu, 19 Jan 2012 21:32:51 +0000 (13:32 -0800)]
am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
4e552533ea049970b54c1cdba5afb7d13496c3c1':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
Robert Ly [Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)]
resolved conflicts for merge of
b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
Xavier Ducrohet [Thu, 19 Jan 2012 21:17:43 +0000 (13:17 -0800)]
Merge "Fix broken drawCircle LayoutLib."
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
Eric Laurent [Thu, 19 Jan 2012 18:52:46 +0000 (10:52 -0800)]
Merge "resolved conflicts for merge of
05683c85 to master"
Robert Ly [Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)]
am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
12310ee801553e63091ce3bda6f07a5be31a473c':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
Gilles Debunne [Thu, 19 Jan 2012 18:23:32 +0000 (10:23 -0800)]
Merge "Touch slop added to double tap detection"
OSDN Git Service
