OSDN Git Service
Andreas Huber [Wed, 12 Jan 2011 22:38:17 +0000 (14:38 -0800)]
am
156a3c9b: am
7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
* commit '
156a3c9ba702f3159e0b4a76c65606b5f97b276c':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
James Dong [Wed, 12 Jan 2011 22:38:12 +0000 (14:38 -0800)]
am
999fb5a5: am
068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '
999fb5a5a952ffb0c13ee5d6940fa1a39f165bcd':
Publish MediaMetadataRetriever.java as public API
Dianne Hackborn [Wed, 12 Jan 2011 22:36:03 +0000 (14:36 -0800)]
am
7ca0b1c5: am
a353581c: Merge "Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
* commit '
7ca0b1c58623ad1adfb3324df235d4172e44c83a':
Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError...
Romain Guy [Wed, 12 Jan 2011 22:35:59 +0000 (14:35 -0800)]
am
dee6089c: am
2e0c5261: Merge "Add logging to the new layers API." into honeycomb
* commit '
dee6089c2de42fcddfd22781c90a2e797b5f592c':
Add logging to the new layers API.
Andreas Huber [Wed, 12 Jan 2011 22:35:46 +0000 (14:35 -0800)]
am
7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
* commit '
7928ca6f87af4b70086ecf75383ba43da37da891':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
James Dong [Wed, 12 Jan 2011 22:35:35 +0000 (14:35 -0800)]
am
068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '
068b41d5d41a4a78c96586b85ea89d464d302548':
Publish MediaMetadataRetriever.java as public API
Andreas Huber [Wed, 12 Jan 2011 22:33:51 +0000 (14:33 -0800)]
Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:33:42 +0000 (14:33 -0800)]
am
0b44f6f5: am
0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database
* commit '
0b44f6f588bb8836c1ef94e8b1f70ed49e2be53b':
MediaScanner: Do not update the file path when updating records already in the database
Dianne Hackborn [Wed, 12 Jan 2011 22:33:15 +0000 (14:33 -0800)]
am
a353581c: Merge "Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
* commit '
a353581c65dba1ca5a27f33a05a0077ffdabf72a':
Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError...
Romain Guy [Wed, 12 Jan 2011 22:33:10 +0000 (14:33 -0800)]
am
2e0c5261: Merge "Add logging to the new layers API." into honeycomb
* commit '
2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
Add logging to the new layers API.
James Dong [Wed, 12 Jan 2011 22:31:34 +0000 (14:31 -0800)]
Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:31:24 +0000 (14:31 -0800)]
am
7ff08aeb: am
a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
* commit '
7ff08aeb7e858513c295e5289f6659b2d1d5574d':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
Mike Lockwood [Wed, 12 Jan 2011 22:31:21 +0000 (14:31 -0800)]
am
b43982e1: am
c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
* commit '
b43982e10de1d13734badb2a10d6eaf2ff8fb298':
Remove permission android.permission.WRITE_MEDIA_STORAGE
Mike Lockwood [Wed, 12 Jan 2011 22:30:53 +0000 (14:30 -0800)]
am
0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database
* commit '
0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
MediaScanner: Do not update the file path when updating records already in the database
Dianne Hackborn [Wed, 12 Jan 2011 22:29:34 +0000 (14:29 -0800)]
Merge "Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
Romain Guy [Wed, 12 Jan 2011 22:29:15 +0000 (14:29 -0800)]
Merge "Add logging to the new layers API." into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:28:37 +0000 (14:28 -0800)]
am
a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
* commit '
a29464335a1d164fde0817715d86ba6224d0a61f':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
Mike Lockwood [Wed, 12 Jan 2011 22:28:33 +0000 (14:28 -0800)]
am
c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
* commit '
c13db22581aebe0ad16a833e778eedf947eccd1f':
Remove permission android.permission.WRITE_MEDIA_STORAGE
Mike Lockwood [Wed, 12 Jan 2011 22:25:13 +0000 (14:25 -0800)]
Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:25:05 +0000 (14:25 -0800)]
Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
Romain Guy [Wed, 12 Jan 2011 22:19:51 +0000 (14:19 -0800)]
am
1138401f: am
e465b117: Merge "Better debug info for layers." into honeycomb
* commit '
1138401f348b2e30dc48c01da9a26e66e51b318c':
Better debug info for layers.
Romain Guy [Wed, 12 Jan 2011 22:17:59 +0000 (14:17 -0800)]
am
e465b117: Merge "Better debug info for layers." into honeycomb
* commit '
e465b11745cdc49283c360fb2acf01649f4f4fb0':
Better debug info for layers.
Romain Guy [Wed, 12 Jan 2011 22:15:59 +0000 (14:15 -0800)]
Merge "Better debug info for layers." into honeycomb
Gilles Debunne [Wed, 12 Jan 2011 22:11:31 +0000 (14:11 -0800)]
am
ee3aadbc: am
54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit '
ee3aadbc95a7b337bfef4ba5058c2605b10da357':
New QuickContactBadge holo style.
Gilles Debunne [Wed, 12 Jan 2011 22:09:42 +0000 (14:09 -0800)]
am
54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit '
54c38bf05da42e40b8726ab2b5a33762081e9345':
New QuickContactBadge holo style.
Gilles Debunne [Wed, 12 Jan 2011 22:07:26 +0000 (14:07 -0800)]
Merge "New QuickContactBadge holo style." into honeycomb
Jason Sams [Wed, 12 Jan 2011 21:35:05 +0000 (13:35 -0800)]
am
fc6528ec: am
8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
* commit '
fc6528ecd1c1285c909cb81ca2196c65086944b1':
Cleanup bitmap uploads Implement standalone mipmap generation.
Jason Sams [Wed, 12 Jan 2011 21:33:22 +0000 (13:33 -0800)]
am
8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
* commit '
8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
Cleanup bitmap uploads Implement standalone mipmap generation.
Jason Sams [Wed, 12 Jan 2011 21:30:41 +0000 (13:30 -0800)]
Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
Amith Yamasani [Wed, 12 Jan 2011 21:21:54 +0000 (13:21 -0800)]
am
c738ef5b: am
fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb
* commit '
c738ef5b30f15ab8cbb47257a29cbddf830dddae':
Use light preference panel drawable for Theme.Light
Amith Yamasani [Wed, 12 Jan 2011 21:20:04 +0000 (13:20 -0800)]
am
fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb
* commit '
fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
Use light preference panel drawable for Theme.Light
Jim Miller [Wed, 12 Jan 2011 21:18:45 +0000 (13:18 -0800)]
am
530f77ea: am
a3a078e3: Merge "Fix
3201849: Use custom Drawable for bg in lockscreen" into honeycomb
* commit '
530f77ea61f71e2b2fb8b64b1c5c3267393e5d84':
Fix
3201849: Use custom Drawable for bg in lockscreen
Amith Yamasani [Wed, 12 Jan 2011 21:18:20 +0000 (13:18 -0800)]
Merge "Use light preference panel drawable for Theme.Light" into honeycomb
Jim Miller [Wed, 12 Jan 2011 21:16:56 +0000 (13:16 -0800)]
am
a3a078e3: Merge "Fix
3201849: Use custom Drawable for bg in lockscreen" into honeycomb
* commit '
a3a078e34317763ad1294e0164c147074584e2e8':
Fix
3201849: Use custom Drawable for bg in lockscreen
Jim Miller [Wed, 12 Jan 2011 21:14:33 +0000 (13:14 -0800)]
Merge "Fix
3201849: Use custom Drawable for bg in lockscreen" into honeycomb
Dianne Hackborn [Wed, 12 Jan 2011 21:03:29 +0000 (13:03 -0800)]
am
45a1ada5: am
02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
* commit '
45a1ada57059e012c6d0cf216cafd852dd1b42ed':
Make ProgressDialog a little less lame.
Dianne Hackborn [Wed, 12 Jan 2011 21:01:42 +0000 (13:01 -0800)]
am
02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
* commit '
02e852f968bac83947cd97a5fe7c7a7064774c5a':
Make ProgressDialog a little less lame.
Dianne Hackborn [Wed, 12 Jan 2011 20:59:27 +0000 (12:59 -0800)]
Merge "Make ProgressDialog a little less lame." into honeycomb
Romain Guy [Wed, 12 Jan 2011 20:54:28 +0000 (12:54 -0800)]
am
5ecceb7d: am
85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '
5ecceb7df70a6e6b2a32ab97630bc625000261da':
Cleanup GL objects on the correct thread.
Romain Guy [Wed, 12 Jan 2011 20:52:41 +0000 (12:52 -0800)]
am
85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '
853548287ffe4eb85d1bd10669270292336d137a':
Cleanup GL objects on the correct thread.
Romain Guy [Wed, 12 Jan 2011 20:51:23 +0000 (12:51 -0800)]
am
b353b3ca: am
cf894c91: Merge "Fix CTS test. Bug #
3345445" into honeycomb
* commit '
b353b3ca7a615b1c857514d775829d95fd6431bc':
Fix CTS test. Bug #
3345445
Romain Guy [Wed, 12 Jan 2011 20:50:50 +0000 (12:50 -0800)]
Merge "Cleanup GL objects on the correct thread." into honeycomb
Romain Guy [Wed, 12 Jan 2011 20:49:35 +0000 (12:49 -0800)]
am
cf894c91: Merge "Fix CTS test. Bug #
3345445" into honeycomb
* commit '
cf894c91a9b6c7749c9bb325c9e54336b97df900':
Fix CTS test. Bug #
3345445
Romain Guy [Wed, 12 Jan 2011 20:47:30 +0000 (12:47 -0800)]
Merge "Fix CTS test. Bug #
3345445" into honeycomb
Kenny Root [Wed, 12 Jan 2011 20:32:09 +0000 (12:32 -0800)]
am
aee96e97: am
5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb
* commit '
aee96e9773c0bddc64f80c4d9ebc0b132726ea1d':
Skip SD card tests on devices without SD cards
Kenny Root [Wed, 12 Jan 2011 20:30:17 +0000 (12:30 -0800)]
am
5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb
* commit '
5e9ba49f5efed4f0adc7ffcf5052668cdfd92a25':
Skip SD card tests on devices without SD cards
Kenny Root [Wed, 12 Jan 2011 20:28:39 +0000 (12:28 -0800)]
Merge "Skip SD card tests on devices without SD cards" into honeycomb
Jaikumar Ganesh [Wed, 12 Jan 2011 20:26:50 +0000 (12:26 -0800)]
am
7347f5e8: am
95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
* commit '
7347f5e830b08685f78299d5bcbf6987753dd0ed':
Add ability to parse keyboard fixed pin auto pair blacklist.
Jaikumar Ganesh [Wed, 12 Jan 2011 20:26:44 +0000 (12:26 -0800)]
am
5e2f9db3: am
fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
* commit '
5e2f9db3f15f36ad931213c15837d48c5fdb590f':
Revert "Add temporary hack for keyboards not following spec."
Jaikumar Ganesh [Wed, 12 Jan 2011 20:25:01 +0000 (12:25 -0800)]
am
95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
* commit '
95a4751f2111d5d7c03c131e9d9dfad6cc32ceed':
Add ability to parse keyboard fixed pin auto pair blacklist.
Jaikumar Ganesh [Wed, 12 Jan 2011 20:24:57 +0000 (12:24 -0800)]
am
fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
* commit '
fc019bd4fa3004ec8e287fee0d277db666891ca3':
Revert "Add temporary hack for keyboards not following spec."
Jaikumar Ganesh [Wed, 12 Jan 2011 20:22:57 +0000 (12:22 -0800)]
Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
Jaikumar Ganesh [Wed, 12 Jan 2011 20:22:50 +0000 (12:22 -0800)]
Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
Leon Scroggins [Wed, 12 Jan 2011 20:05:16 +0000 (12:05 -0800)]
am
6fcaec50: am
1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
* commit '
6fcaec50765424c969c7f9320e68fa6b1d5ed949':
Differentiate between clicks for focus and actual clicks.
Leon Scroggins [Wed, 12 Jan 2011 20:03:24 +0000 (12:03 -0800)]
am
1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
* commit '
1415bb7a948e0add9f6beb6dccbea70e9d2bedd0':
Differentiate between clicks for focus and actual clicks.
Kenny Root [Wed, 12 Jan 2011 20:02:04 +0000 (12:02 -0800)]
am
c669559d: am
b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
* commit '
c669559dc3c1d348145d902c623166a9d874b5a8':
Allow updated system apps to retain priority
Leon Scroggins [Wed, 12 Jan 2011 20:01:31 +0000 (12:01 -0800)]
Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
Kenny Root [Wed, 12 Jan 2011 20:00:13 +0000 (12:00 -0800)]
am
b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
* commit '
b5a4b5d300bc05a969181155a4f155a79241f792':
Allow updated system apps to retain priority
Kenny Root [Wed, 12 Jan 2011 19:58:11 +0000 (11:58 -0800)]
Merge "Allow updated system apps to retain priority" into honeycomb
James Dong [Wed, 12 Jan 2011 19:57:54 +0000 (11:57 -0800)]
am
5df82ef9: am
cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
* commit '
5df82ef953a4b0f29ab4690b838a7b269b1b4ab1':
Speed up MP3Extractor using cached reads
Alex Sakhartchouk [Wed, 12 Jan 2011 19:57:48 +0000 (11:57 -0800)]
am
941f8659: am
27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb
* commit '
941f86590cb4e26f070aa5a72a5e215d6555d7bc':
Adding ability to load cubemaps from individual faces.
James Dong [Wed, 12 Jan 2011 19:56:01 +0000 (11:56 -0800)]
am
cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
* commit '
cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
Speed up MP3Extractor using cached reads
Alex Sakhartchouk [Wed, 12 Jan 2011 19:55:54 +0000 (11:55 -0800)]
am
27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb
* commit '
27d116085ebbb112ec1fd959763a027ec08f7179':
Adding ability to load cubemaps from individual faces.
James Dong [Wed, 12 Jan 2011 19:54:32 +0000 (11:54 -0800)]
Merge "Speed up MP3Extractor using cached reads" into honeycomb
Alex Sakhartchouk [Wed, 12 Jan 2011 19:53:42 +0000 (11:53 -0800)]
Merge "Adding ability to load cubemaps from individual faces." into honeycomb
Kristian Monsen [Wed, 12 Jan 2011 19:42:02 +0000 (11:42 -0800)]
am
4cfa6447: am
7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
* commit '
4cfa64479f61a74267e57622acd18c6f692b9982':
Add a static method to get the InputStream of a content URL
Kristian Monsen [Wed, 12 Jan 2011 19:41:59 +0000 (11:41 -0800)]
am
40e086c4: am
6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
* commit '
40e086c4226ea05ebf09926a9181735ce28d6d83':
Adding a static method to get the size of a content url
Michael Jurka [Wed, 12 Jan 2011 19:41:46 +0000 (11:41 -0800)]
am
bc534054: am
b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
* commit '
bc5340548b52f2be5b5ae1354f7c25450b3e2966':
Add sym_def_app_icon to mipmap directory
Kristian Monsen [Wed, 12 Jan 2011 19:17:13 +0000 (11:17 -0800)]
am
7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
* commit '
7a8f01abf98b6212358ea0e0401879093d2c0f93':
Add a static method to get the InputStream of a content URL
Kristian Monsen [Wed, 12 Jan 2011 19:17:11 +0000 (11:17 -0800)]
am
6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
* commit '
6c5e4dc2312f0b6a3c02972c382d5a047793e734':
Adding a static method to get the size of a content url
Kristian Monsen [Wed, 12 Jan 2011 19:15:20 +0000 (11:15 -0800)]
Merge "Add a static method to get the InputStream of a content URL" into honeycomb
Kristian Monsen [Wed, 12 Jan 2011 19:15:09 +0000 (11:15 -0800)]
Merge "Adding a static method to get the size of a content url" into honeycomb
Michael Jurka [Wed, 12 Jan 2011 19:08:28 +0000 (11:08 -0800)]
am
b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
* commit '
b609881fb0f27c7e6fd3ec955a35d2c78a5852ab':
Add sym_def_app_icon to mipmap directory
Michael Jurka [Wed, 12 Jan 2011 19:06:44 +0000 (11:06 -0800)]
Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
Chet Haase [Wed, 12 Jan 2011 19:06:12 +0000 (11:06 -0800)]
am
0ba9ab29: am
535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
* commit '
0ba9ab29567b7b2fe2e5bdad23f1832b5c37d503':
New interpolator resources now found in interpolator/ directory
Chet Haase [Wed, 12 Jan 2011 19:04:22 +0000 (11:04 -0800)]
am
535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
* commit '
535d5edad225a2855e952a1883310c4a0fa43b72':
New interpolator resources now found in interpolator/ directory
Chet Haase [Wed, 12 Jan 2011 19:01:50 +0000 (11:01 -0800)]
Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
Huahui Wu [Wed, 12 Jan 2011 19:01:11 +0000 (11:01 -0800)]
am
012acc86: am
342bfbf9: Merge "b/
3340946 Fix NPE caused by null gesture detector." into honeycomb
* commit '
012acc86200be85d5473763478b6ae87ac502ecb':
b/
3340946 Fix NPE caused by null gesture detector.
Huahui Wu [Wed, 12 Jan 2011 18:59:22 +0000 (10:59 -0800)]
am
342bfbf9: Merge "b/
3340946 Fix NPE caused by null gesture detector." into honeycomb
* commit '
342bfbf94fa806be8fefa7ff905ba0a0b0b98df0':
b/
3340946 Fix NPE caused by null gesture detector.
Huahui Wu [Wed, 12 Jan 2011 18:57:51 +0000 (10:57 -0800)]
Merge "b/
3340946 Fix NPE caused by null gesture detector." into honeycomb
Dianne Hackborn [Wed, 12 Jan 2011 18:41:49 +0000 (10:41 -0800)]
am
20acd9d9: am
6014527c: Add "min size" facility to the Window class.
* commit '
20acd9d93d77147fb7813ef6c64112bcf82b407a':
Add "min size" facility to the Window class.
Dianne Hackborn [Wed, 12 Jan 2011 18:39:58 +0000 (10:39 -0800)]
am
6014527c: Add "min size" facility to the Window class.
* commit '
6014527c350895383b99ba91d3d009a32b1d22a6':
Add "min size" facility to the Window class.
Patrick Scott [Wed, 12 Jan 2011 17:48:46 +0000 (09:48 -0800)]
am
b3b7197c: (-s ours) am
92a9a3c5: Merge "Do not merge." into honeycomb
* commit '
b3b7197cd47f2f0df733c11c919df1e4160bdaf9':
Do not merge.
Patrick Scott [Wed, 12 Jan 2011 17:47:09 +0000 (09:47 -0800)]
am
92a9a3c5: Merge "Do not merge." into honeycomb
* commit '
92a9a3c5ef9774863b4cee93d43b67582a02c2f0':
Do not merge.
Patrick Scott [Wed, 12 Jan 2011 17:44:59 +0000 (09:44 -0800)]
Merge "Do not merge." into honeycomb
Glenn Kasten [Wed, 12 Jan 2011 17:38:38 +0000 (09:38 -0800)]
am
5ac80dde: am
e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
* commit '
5ac80dde0480f06a7fab9a15c2df90d6aee1ba22':
Fix race in buffer ref counting.
Glenn Kasten [Wed, 12 Jan 2011 17:36:00 +0000 (09:36 -0800)]
am
e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
* commit '
e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
Glenn Kasten [Wed, 12 Jan 2011 17:34:37 +0000 (09:34 -0800)]
Merge "Fix race in buffer ref counting." into honeycomb
Glenn Kasten [Wed, 12 Jan 2011 17:31:46 +0000 (09:31 -0800)]
Cary Clark [Wed, 12 Jan 2011 16:23:35 +0000 (08:23 -0800)]
am
45c67430: am
688b0af6: Merge "add null check to copy selection" into honeycomb
* commit '
45c674304e11a819fa1244f666ab13613f411d3e':
add null check to copy selection
Cary Clark [Wed, 12 Jan 2011 16:21:03 +0000 (08:21 -0800)]
am
688b0af6: Merge "add null check to copy selection" into honeycomb
* commit '
688b0af6a888a8a427d9a4c82fedf3e345e6ae34':
add null check to copy selection
Cary Clark [Wed, 12 Jan 2011 16:19:24 +0000 (08:19 -0800)]
Merge "add null check to copy selection" into honeycomb
Robert Greenwalt [Wed, 12 Jan 2011 15:21:32 +0000 (07:21 -0800)]
am
1ea7e5df: am
a78e9f05: Merge "Fix any_connection reporting." into honeycomb
* commit '
1ea7e5df91f023d03fa7c87c534e6024795abaaa':
Fix any_connection reporting.
Robert Greenwalt [Wed, 12 Jan 2011 15:19:05 +0000 (07:19 -0800)]
am
a78e9f05: Merge "Fix any_connection reporting." into honeycomb
* commit '
a78e9f055834030ebe25480004f667f4bca35232':
Fix any_connection reporting.
Robert Greenwalt [Wed, 12 Jan 2011 15:16:56 +0000 (07:16 -0800)]
Merge "Fix any_connection reporting." into honeycomb
satok [Wed, 12 Jan 2011 09:21:59 +0000 (01:21 -0800)]
am
52b18265: am
31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
* commit '
52b18265680073c02b0b0a1ff9c3d4d95a6779be':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
satok [Wed, 12 Jan 2011 09:20:24 +0000 (01:20 -0800)]
am
31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
* commit '
31d9d895d79977fa4e6dff2491b209fbeb21c61b':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
satok [Wed, 12 Jan 2011 09:17:58 +0000 (01:17 -0800)]
Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
Brad Fitzpatrick [Wed, 12 Jan 2011 08:07:38 +0000 (00:07 -0800)]
am
43194ce0: am
52d70722: am
cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit '
43194ce05eef26665572fb248a108fd24d247a8f':
Closing cursor in finalizer to avoid GREF and fd leak in acore
Dianne Hackborn [Wed, 12 Jan 2011 08:07:33 +0000 (00:07 -0800)]
am
5eefd98a: am
a9d8a69a: am
9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '
5eefd98aa3c461c65822cce56e04a7e5d1af2dae':
Referencing of "r.record.name" is occured, when "r.record" is null.
OSDN Git Service
