OSDN Git Service
Gilles Debunne [Fri, 20 Jan 2012 18:28:56 +0000 (10:28 -0800)]
am
1d98303a: Merge "AOOB in AutoComplete"
* commit '
1d98303ab6141af57dc841115486d9795fc94d02':
AOOB in AutoComplete
Gilles Debunne [Fri, 20 Jan 2012 18:28:53 +0000 (10:28 -0800)]
am
7418c35d: Merge "Make sure text selection always starts"
* commit '
7418c35d80e3462fe6f80ed1394e2d31c8b1b6bf':
Make sure text selection always starts
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"
Glenn Kasten [Fri, 20 Jan 2012 18:09:09 +0000 (10:09 -0800)]
am
7524a592: Merge "Remove dead setRingerMode(mode, mask)"
* commit '
7524a592526a14d20ec3f3acffd61fe18afaa4b4':
Remove dead setRingerMode(mode, mask)
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:34:40 +0000 (08:34 -0800)]
am
1b4d6049: Merge "Fix build warning for void * arithmetic"
* commit '
1b4d60497c6c89ae1457e802446c83ca7c8c0017':
Fix build warning for void * arithmetic
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:39:40 +0000 (01:39 -0800)]
am
f17e7c27: Merge "Fixes some javadoc."
* commit '
f17e7c272e27671d12fbf676d209f0a77f1acda1':
Fixes some javadoc.
Pin Ting [Fri, 20 Jan 2012 09:37:12 +0000 (01:37 -0800)]
Merge "Fixes some javadoc."
Jeff Brown [Fri, 20 Jan 2012 03:55:58 +0000 (19:55 -0800)]
am
8592baa3: Merge "Don\'t need to link to libsqlite from media JNI library."
* commit '
8592baa347f5874b4f36713b6ca2edcedbb3f071':
Don't need to link to libsqlite from media JNI library.
Jeff Brown [Fri, 20 Jan 2012 03:55:55 +0000 (19:55 -0800)]
am
46deab0a: Merge "Clean up SQLiteDebug natives."
* commit '
46deab0a694e7e3c79980904706a4d09bbda001a':
Clean up SQLiteDebug natives.
Jeff Brown [Fri, 20 Jan 2012 03:55:52 +0000 (19:55 -0800)]
am
b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code."
* commit '
b815d0f80ae58bc48008186d3919e7c6e51fb43e':
Remove custom SQLITE_UNCLOSED error code.
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:55:06 +0000 (18:55 -0800)]
am
20c53cb3: Merge "Remove obsolete TODO comments"
* commit '
20c53cb3aa8489c11004ac718c0891273391ac8c':
Remove obsolete TODO comments
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:36:34 +0000 (18:36 -0800)]
am
22d41843: Fix the build, for real
* commit '
22d418437e44587cb0fba4353515719453269189':
Fix the build, for real
Romain Guy [Fri, 20 Jan 2012 02:17:54 +0000 (18:17 -0800)]
Romain Guy [Fri, 20 Jan 2012 02:16:11 +0000 (18:16 -0800)]
Merge "Fix build"
Romain Guy [Fri, 20 Jan 2012 01:44:50 +0000 (17:44 -0800)]
am
d2f0dcd1: Merge "Remove unused code"
* commit '
d2f0dcd182fbc0423d206919e81f3845fb9b8155':
Remove unused code
Romain Guy [Fri, 20 Jan 2012 01:42:10 +0000 (17:42 -0800)]
Merge "Remove unused code"
Romain Guy [Fri, 20 Jan 2012 01:37:10 +0000 (17:37 -0800)]
am
bad12166: Merge "Deprecate unused APIs"
* commit '
bad12166190a7e8087eb5db0ae8df9a4e5843fde':
Deprecate unused APIs
Romain Guy [Fri, 20 Jan 2012 01:34:26 +0000 (17:34 -0800)]
Merge "Deprecate unused APIs"
Andreas Huber [Thu, 19 Jan 2012 22:42:10 +0000 (14:42 -0800)]
am
fa78fe0d: Merge "Make sure the ThrottledSource reports the proper mime type"
* commit '
fa78fe0d70fe7e6a9eb19680888b617ea57eaad4':
Make sure the ThrottledSource reports the proper mime type
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:21:23 +0000 (14:21 -0800)]
am
a6885fa3: Merge "Remove no longer needed EventHub usleep() optimization."
* commit '
a6885fa366116c9dbc8ecba2abe32bf516912e8f':
Remove no longer needed EventHub usleep() optimization.
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:13:53 +0000 (14:13 -0800)]
am
ea33f4bc: Merge "Fix line wrapping."
* commit '
ea33f4bca5def40c75214dedb3ea63c70b2a462a':
Fix line wrapping.
Jeff Brown [Thu, 19 Jan 2012 22:11:47 +0000 (14:11 -0800)]
Merge "Fix line wrapping."
Jeff Brown [Thu, 19 Jan 2012 22:08:23 +0000 (14:08 -0800)]
am
3e8d7cfd: Merge "Clean up SQLite debugging code."
* commit '
3e8d7cfd1e6e65a60a9f6b7e174672dc9a281e49':
Clean up SQLite debugging code.
Jeff Brown [Thu, 19 Jan 2012 22:05:39 +0000 (14:05 -0800)]
Merge "Clean up SQLite debugging code."
Xavier Ducrohet [Thu, 19 Jan 2012 21:19:28 +0000 (13:19 -0800)]
am
cd836bbb: Merge "Fix broken drawCircle LayoutLib."
* commit '
cd836bbb8be8f4c93d6086a30da616c3b00f859e':
Fix broken drawCircle LayoutLib.
Xavier Ducrohet [Thu, 19 Jan 2012 21:17:43 +0000 (13:17 -0800)]
Merge "Fix broken drawCircle LayoutLib."
Eric Laurent [Thu, 19 Jan 2012 18:54:03 +0000 (10:54 -0800)]
am
e988e0c3: Merge "resolved conflicts for merge of
05683c85 to master"
* commit '
e988e0c31ca16160dee1b7c689ac31cd70fe43a2':
AudioFlinger: mix track only when really ready (2)
Eric Laurent [Thu, 19 Jan 2012 18:52:46 +0000 (10:52 -0800)]
Merge "resolved conflicts for merge of
05683c85 to master"
Gilles Debunne [Thu, 19 Jan 2012 18:24:59 +0000 (10:24 -0800)]
am
b3ca0fe6: Merge "Touch slop added to double tap detection"
* commit '
b3ca0fe66c1def11a04b18e6872318deb0340b9b':
Touch slop added to double tap detection
Gilles Debunne [Thu, 19 Jan 2012 18:24:57 +0000 (10:24 -0800)]
am
bdf7f965: Merge "Fixes around extract mode"
* commit '
bdf7f9658044d4c55c4826a88a41822045557ee5':
Fixes around extract mode
Gilles Debunne [Thu, 19 Jan 2012 18:23:32 +0000 (10:23 -0800)]
Merge "Touch slop added to double tap detection"
Gilles Debunne [Thu, 19 Jan 2012 18:23:18 +0000 (10:23 -0800)]
Merge "Fixes around extract mode"
Teng-Hui Zhu [Thu, 19 Jan 2012 18:03:07 +0000 (10:03 -0800)]
am
de9f0036: Merge "Support full screen back to back playing using javascript"
* commit '
de9f0036ef58a55ca89a3c427a462bd84b5751c3':
Support full screen back to back playing using javascript
Teng-Hui Zhu [Thu, 19 Jan 2012 18:00:40 +0000 (10:00 -0800)]
Merge "Support full screen back to back playing using javascript"
Eric Laurent [Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)]
resolved conflicts for merge of
05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
Glenn Kasten [Thu, 19 Jan 2012 17:51:40 +0000 (09:51 -0800)]
am
00db1f52: Rename JNI implementation to match Java method
* commit '
00db1f52b1c12d3670a0419305aa7548f7932aa0':
Rename JNI implementation to match Java method
Glenn Kasten [Thu, 19 Jan 2012 14:13:00 +0000 (06:13 -0800)]
am
92ecdd63: Merge "Fix incorrect includes of AudioTrack.h"
* commit '
92ecdd63033a53b3c6301a9dc94c2438e498f27b':
Fix incorrect includes of AudioTrack.h
Glenn Kasten [Thu, 19 Jan 2012 14:10:48 +0000 (06:10 -0800)]
am
adf10837: Merge "Simplify range check for audio_mode_t (continued)"
* commit '
adf10837719627e725187e26a2e3654ba97245c8':
Simplify range check for audio_mode_t (continued)
Glenn Kasten [Thu, 19 Jan 2012 14:10:45 +0000 (06:10 -0800)]
am
6808516e: Merge "Add units to time periods"
* commit '
6808516e8e2327ddf4a6b2f3528d3a4d3ff105b3':
Add units to time periods
Glenn Kasten [Thu, 19 Jan 2012 14:10:42 +0000 (06:10 -0800)]
am
f4a93d09: Merge "Use const const strings for arrays and pointers to strings"
* commit '
f4a93d0965f5e4c6ea22798a83823174fa9f38eb':
Use const const strings for arrays and pointers to strings
Glenn Kasten [Thu, 19 Jan 2012 14:10:39 +0000 (06:10 -0800)]
am
0d7a9979: Merge "For booleans, use ! instead of == false"
* commit '
0d7a9979651511eb69bab14068fc0bee5d1a8441':
For booleans, use ! instead of == false
Glenn Kasten [Thu, 19 Jan 2012 14:10:37 +0000 (06:10 -0800)]
Merge "Fix incorrect includes of AudioTrack.h"
Glenn Kasten [Thu, 19 Jan 2012 14:10:36 +0000 (06:10 -0800)]
am
e119bd14: Merge "Replace run-time stream types by compile-time"
* commit '
e119bd144207b9b89ec7d52ee619bdbcda8ab497':
Replace run-time stream types by compile-time
Glenn Kasten [Thu, 19 Jan 2012 14:09:20 +0000 (06:09 -0800)]
Merge "Simplify range check for audio_mode_t (continued)"
Glenn Kasten [Thu, 19 Jan 2012 14:09:05 +0000 (06:09 -0800)]
Merge "Add units to time periods"
Glenn Kasten [Thu, 19 Jan 2012 14:08:53 +0000 (06:08 -0800)]
Merge "Use const const strings for arrays and pointers to strings"
Glenn Kasten [Thu, 19 Jan 2012 14:08:40 +0000 (06:08 -0800)]
Merge "For booleans, use ! instead of == false"
Glenn Kasten [Thu, 19 Jan 2012 14:08:12 +0000 (06:08 -0800)]
Merge "Replace run-time stream types by compile-time"
Jeff Brown [Thu, 19 Jan 2012 02:33:03 +0000 (18:33 -0800)]
am
6534c0e0: Merge "Fix issues with reentrant SQLite triggers."
* commit '
6534c0e0548332801cffaa0977af165025030297':
Fix issues with reentrant SQLite triggers.
Jeff Brown [Thu, 19 Jan 2012 02:31:06 +0000 (18:31 -0800)]
Merge "Fix issues with reentrant SQLite triggers."
Romain Guy [Thu, 19 Jan 2012 02:16:10 +0000 (18:16 -0800)]
am
a37a108c: Merge "Add basic code required for drawPicture()"
* commit '
a37a108cfbaa23bcddaaeab4b838bec262bc2441':
Add basic code required for drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:14:27 +0000 (18:14 -0800)]
Merge "Add basic code required for drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:12:51 +0000 (18:12 -0800)]
am
e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()"
* commit '
e7bdf2d9d0107afadddb6498331cd21be260d23c':
Don't crash on Canvas.drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:11:09 +0000 (18:11 -0800)]
Merge "Don't crash on Canvas.drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:03:23 +0000 (18:03 -0800)]
am
4785a6ff: Merge "Full support for Canvas.drawPosText"
* commit '
4785a6ff8d48f51813611f2cab998b235ce2bbca':
Full support for Canvas.drawPosText
Romain Guy [Thu, 19 Jan 2012 02:01:34 +0000 (18:01 -0800)]
Merge "Full support for Canvas.drawPosText"
Wink Saville [Thu, 19 Jan 2012 00:11:29 +0000 (16:11 -0800)]
am
170bfe32: am
7b6231a4: am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
170bfe32ab8971805d56f8870758cbc46060d1ef':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Christopher Tate [Thu, 19 Jan 2012 00:11:27 +0000 (16:11 -0800)]
am
d3f2f59c: Merge "Fix edge cases leading to backup hanging forever"
* commit '
d3f2f59c46b3979a76eae02cfb4a7071425556e1':
Fix edge cases leading to backup hanging forever
Eric Laurent [Thu, 19 Jan 2012 00:08:06 +0000 (16:08 -0800)]
am
db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit '
db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
Wink Saville [Thu, 19 Jan 2012 00:08:04 +0000 (16:08 -0800)]
am
7b6231a4: am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Christopher Tate [Thu, 19 Jan 2012 00:07:28 +0000 (16:07 -0800)]
Merge "Fix edge cases leading to backup hanging forever"
Wink Saville [Thu, 19 Jan 2012 00:05:43 +0000 (16:05 -0800)]
am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Eric Laurent [Thu, 19 Jan 2012 00:05:31 +0000 (16:05 -0800)]
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Stephen Hines [Wed, 18 Jan 2012 23:44:21 +0000 (15:44 -0800)]
am
03cbb97e: Merge "Run ComputePerf multiple times."
* commit '
03cbb97e4ef89590cbcb4cb682ec0d90d601e8dd':
Run ComputePerf multiple times.
Stephen Hines [Wed, 18 Jan 2012 23:42:46 +0000 (15:42 -0800)]
Merge "Run ComputePerf multiple times."
Alex Sakhartchouk [Wed, 18 Jan 2012 22:55:11 +0000 (14:55 -0800)]
Merge "Making sure that renderpass objects get properly updated." into graphics-dev
Adam Powell [Wed, 18 Jan 2012 22:53:55 +0000 (14:53 -0800)]
am
ea77ed02: am
a6a0d134: am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
ea77ed02e44ebd177e3c7e1797d9cb804820ce43':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:51:35 +0000 (14:51 -0800)]
am
a6a0d134: am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:49:30 +0000 (14:49 -0800)]
am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Jeff Brown [Wed, 18 Jan 2012 22:46:08 +0000 (14:46 -0800)]
am
2a16b137: Merge "Improve heuristics for orientation detection."
* commit '
2a16b1374413abe513c0b60597262d45360138f7':
Improve heuristics for orientation detection.
Jeff Brown [Wed, 18 Jan 2012 22:43:16 +0000 (14:43 -0800)]
Merge "Improve heuristics for orientation detection."
Michael Kolb [Wed, 18 Jan 2012 22:03:09 +0000 (14:03 -0800)]
am
d9fdd9fd: Merge "Prevent IME from popping up on startup"
* commit '
d9fdd9fd7862b0d56094fa9846fb7c730ec305a8':
Prevent IME from popping up on startup
Michael Kolb [Wed, 18 Jan 2012 22:00:52 +0000 (14:00 -0800)]
Merge "Prevent IME from popping up on startup"
Robert Ly [Wed, 18 Jan 2012 21:24:45 +0000 (13:24 -0800)]
am
ca917ac1: am
c891c6ef: am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
ca917ac1e6d2cca9f3a673d8453621ddc4e6602b':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:24:42 +0000 (13:24 -0800)]
am
b41c96a3: am
43fda84e: am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
b41c96a374134c84558291fbb532fe490386a4ba':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:21:54 +0000 (13:21 -0800)]
am
c891c6ef: am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
c891c6eff7ab320092af4ec5b235f83866f66261':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:21:51 +0000 (13:21 -0800)]
am
43fda84e: am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
43fda84e91b1fe356af35386d2f304d3ab71529e':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:19:52 +0000 (13:19 -0800)]
am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:19:50 +0000 (13:19 -0800)]
am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Martijn Coenen [Wed, 18 Jan 2012 21:11:44 +0000 (13:11 -0800)]
am
1ad65e70: Merge "Remove LlcpPacket from public namespace."
* commit '
1ad65e7054fa757b6c909550691d849fcb43e8b9':
Remove LlcpPacket from public namespace.
Martijn Coenen [Wed, 18 Jan 2012 21:09:55 +0000 (13:09 -0800)]
Merge "Remove LlcpPacket from public namespace."
Joe Fernandez [Wed, 18 Jan 2012 20:39:28 +0000 (12:39 -0800)]
am
5689317a: am
58f9c3da: am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
5689317a6f33e03a19359104fc2cda3ef2f20771':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:37:22 +0000 (12:37 -0800)]
am
58f9c3da: am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
58f9c3da340eb36051bc20d6b8cec6b982852ee0':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:35:30 +0000 (12:35 -0800)]
am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Alex Sakhartchouk [Wed, 18 Jan 2012 19:43:41 +0000 (11:43 -0800)]
Merge "Fixing blur passes. Refactoring." into graphics-dev
Andreas Huber [Wed, 18 Jan 2012 19:03:14 +0000 (11:03 -0800)]
am
b2d81fea: Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
* commit '
b2d81fead90f556279d611b6f15881c663558ad5':
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures