OSDN Git Service
Jason Sams [Wed, 12 Jan 2011 23:30:18 +0000 (15:30 -0800)]
am
ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
* commit '
ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
WAR driver bug where surfaces of size 0 fail.
Huahui Wu [Wed, 12 Jan 2011 23:30:14 +0000 (15:30 -0800)]
am
55873051: Merge "b/
3344966 pan following the focus point instead the first point." into honeycomb
* commit '
558730510963ad80d7a539351b3f1cb16e3040c2':
b/
3344966 pan following the focus point instead the first point.
Jason Sams [Wed, 12 Jan 2011 23:28:19 +0000 (15:28 -0800)]
Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
Huahui Wu [Wed, 12 Jan 2011 23:27:16 +0000 (15:27 -0800)]
Merge "b/
3344966 pan following the focus point instead the first point." into honeycomb
Jason Sams [Wed, 12 Jan 2011 23:24:08 +0000 (15:24 -0800)]
am
208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
* commit '
208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*
Jason Sams [Wed, 12 Jan 2011 23:22:09 +0000 (15:22 -0800)]
Merge "Implement more of copy2DRange*" into honeycomb
Justin Ho [Wed, 12 Jan 2011 23:08:24 +0000 (15:08 -0800)]
am
63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
* commit '
63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon
Romain Guy [Wed, 12 Jan 2011 23:08:17 +0000 (15:08 -0800)]
am
b08ea03c: Merge "Reenable region composition pipeline for layers Bug #
3341848" into honeycomb
* commit '
b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
Reenable region composition pipeline for layers Bug #
3341848
Justin Ho [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]
Merge "Updated notification sounds for trygon" into honeycomb
Romain Guy [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]
Merge "Reenable region composition pipeline for layers Bug #
3341848" into honeycomb
Xia Wang [Wed, 12 Jan 2011 23:03:41 +0000 (15:03 -0800)]
am
1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug:
3336896" into honeycomb
* commit '
1aaae92f990bad51d503fe692def01191fda4db7':
Wait for Wi-Fi state change before set the state verification criteria. bug:
3336896
Jamie Gennis [Wed, 12 Jan 2011 23:03:37 +0000 (15:03 -0800)]
am
103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
* commit '
103198a10cc22a49270a787d04b8ab484d2ec235':
Implement crop & transform for SurfaceTexture.
Carl Shapiro [Wed, 12 Jan 2011 23:03:34 +0000 (15:03 -0800)]
am
d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
* commit '
d688e5af1c95a8b5a482c146cd789c2be45f9663':
Remove minimum heap size test now that the underlying interface is gone.
Marco Nelissen [Wed, 12 Jan 2011 23:03:28 +0000 (15:03 -0800)]
am
a8a656b0: Fix scanning of modified files.
* commit '
a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.
Kenny Root [Wed, 12 Jan 2011 23:03:24 +0000 (15:03 -0800)]
am
e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb
* commit '
e7b2310a856889aa1e683104039033ada3f6b696':
Make sure AppCacheTest casts to long
Brad Fitzpatrick [Wed, 12 Jan 2011 23:03:15 +0000 (15:03 -0800)]
am
2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit '
2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
Unhide Content{Resolver,Provider}.call()
Stephen Hines [Wed, 12 Jan 2011 23:03:07 +0000 (15:03 -0800)]
am
a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
* commit '
a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
Unhide more of the RS APIs.
Xia Wang [Wed, 12 Jan 2011 22:58:46 +0000 (14:58 -0800)]
Merge "Wait for Wi-Fi state change before set the state verification criteria. bug:
3336896" into honeycomb
Jamie Gennis [Wed, 12 Jan 2011 22:57:29 +0000 (14:57 -0800)]
Merge "Implement crop & transform for SurfaceTexture." into honeycomb
Carl Shapiro [Wed, 12 Jan 2011 22:51:54 +0000 (14:51 -0800)]
Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
Kenny Root [Wed, 12 Jan 2011 22:40:57 +0000 (14:40 -0800)]
Merge "Make sure AppCacheTest casts to long" into honeycomb
Brad Fitzpatrick [Wed, 12 Jan 2011 22:39:50 +0000 (14:39 -0800)]
Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
Stephen Hines [Wed, 12 Jan 2011 22:39:11 +0000 (14:39 -0800)]
Merge "Unhide more of the RS APIs." into honeycomb
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
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: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: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: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: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: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
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: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: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: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: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: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: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.
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: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
Jamie Gennis [Mon, 10 Jan 2011 00:33:17 +0000 (16:33 -0800)]
Implement crop & transform for SurfaceTexture.
This change adds support for the setCrop and setTransform methods of the
SurfaceTexture C++ class. The crop and transform for the current
texture will be accessed by applications as a single texture coordinate
transform matrix.
Change-Id: I6482bf96f680e5c175364e848936db3908d6c8f8
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: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 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: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: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: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
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: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: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:04:27 +0000 (00:04 -0800)]
am
52d70722: am
cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit '
52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
Dianne Hackborn [Wed, 12 Jan 2011 08:04:18 +0000 (00:04 -0800)]
am
a9d8a69a: am
9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '
a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
Chris Tate [Wed, 12 Jan 2011 08:04:12 +0000 (00:04 -0800)]
am
69f8d3c6: (-s ours) am
bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit '
69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Chris Tate [Wed, 12 Jan 2011 08:04:04 +0000 (00:04 -0800)]
am
9b1bd2c7: (-s ours) am
6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '
9b1bd2c7d1acffa1079d589811450140518e5ce5':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
Dianne Hackborn [Wed, 12 Jan 2011 08:03:53 +0000 (00:03 -0800)]
am
412ebd6f: am
433863b1: Fix issue #
3333958: Package Manager can sometimes mistakenly think...
* commit '
412ebd6f9d18eebc11d8473318316aef1dfc5caa':
Fix issue #
3333958: Package Manager can sometimes mistakenly think...
Dianne Hackborn [Wed, 12 Jan 2011 08:03:45 +0000 (00:03 -0800)]
am
95db1cfc: am
cd23823d: Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit '
95db1cfc741c23c7f4192128e3b7bb3c43761bdb':
Wei-Ta Chen [Wed, 12 Jan 2011 07:18:29 +0000 (23:18 -0800)]
am
4b9adfbe: Merge "Correct the API comments." into honeycomb
* commit '
4b9adfbe7d0cf578b82eb7794c506ad1986854b9':
Correct the API comments.
Wei-Ta Chen [Wed, 12 Jan 2011 07:16:15 +0000 (23:16 -0800)]
Merge "Correct the API comments." into honeycomb
Svetoslav Ganov [Wed, 12 Jan 2011 05:58:22 +0000 (21:58 -0800)]
am
2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb
* commit '
2ad2bf232714009586c5163e08754886bdd9ea20':
Renaming NumberPicker resources to be consistent.
Svetoslav Ganov [Wed, 12 Jan 2011 05:56:03 +0000 (21:56 -0800)]
Merge "Renaming NumberPicker resources to be consistent." into honeycomb
Christopher Tate [Wed, 12 Jan 2011 04:03:57 +0000 (20:03 -0800)]
am
28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
* commit '
28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
Christopher Tate [Wed, 12 Jan 2011 04:02:35 +0000 (20:02 -0800)]
Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb