OSDN Git Service
The Android Automerger [Tue, 25 Jan 2011 07:45:43 +0000 (23:45 -0800)]
resolved conflicts for merge of
42f87e1b to honeycomb-plus-aosp
Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
Xavier Ducrohet [Tue, 25 Jan 2011 01:29:14 +0000 (17:29 -0800)]
am
d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb
* commit '
d7d15831d79aae53e2b7d9d402a2503e9f68dc98':
Update the SDK platform components to API 11.
Xavier Ducrohet [Tue, 25 Jan 2011 01:26:12 +0000 (17:26 -0800)]
Merge "Update the SDK platform components to API 11." into honeycomb
Xavier Ducrohet [Tue, 25 Jan 2011 01:24:33 +0000 (17:24 -0800)]
Update the SDK platform components to API 11.
Change-Id: I17f202c986ca0a27e89f02430bb2400eaa85c534
Jeff Brown [Mon, 24 Jan 2011 23:33:40 +0000 (15:33 -0800)]
am
24e38f1b: Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb
* commit '
24e38f1bef4d8600c64029ce20f9ee7d9d6201a5':
Add WindowOrientationListener log enable/disable checkbox.
Jeff Brown [Mon, 24 Jan 2011 23:31:31 +0000 (15:31 -0800)]
Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb
Nick Pelly [Mon, 24 Jan 2011 21:23:48 +0000 (13:23 -0800)]
am
1717afbc: am
072bca5b: Add Tag app to eclipse classpath
* commit '
1717afbca4361cc190d3a3098c4ffce6ddb443f0':
Add Tag app to eclipse classpath
Yu Shan Emily Lau [Mon, 24 Jan 2011 20:28:40 +0000 (12:28 -0800)]
am
d391ae20: Fixed the appCrashBugreport reset flag. Bug#
3383876
* commit '
d391ae20984ff1323b8d59c8dcfdda18154b957d':
Fixed the appCrashBugreport reset flag. Bug#
3383876
Yu Shan Emily Lau [Mon, 24 Jan 2011 19:52:51 +0000 (11:52 -0800)]
Fixed the appCrashBugreport reset flag. Bug#
3383876
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
Jeff Brown [Mon, 24 Jan 2011 08:02:08 +0000 (00:02 -0800)]
am
f40ea5cf: (-s ours) am
98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit '
f40ea5cfd9523f1303d1711dbf7df3ccb5697a0a':
Prevent monkey from turning off the screen. (DO NOT MERGE)
Jeff Brown [Sun, 23 Jan 2011 22:57:12 +0000 (14:57 -0800)]
Add WindowOrientationListener log enable/disable checkbox.
Change-Id: I1107eb39a72b42ddc97e611c3fc33c3997ed49cd
Dianne Hackborn [Sun, 23 Jan 2011 22:41:27 +0000 (14:41 -0800)]
am
7c69dba7: Remove use of old theme name.
* commit '
7c69dba7cc03073820d567dcb2fa6af031326e7a':
Remove use of old theme name.
Dianne Hackborn [Sun, 23 Jan 2011 21:28:02 +0000 (13:28 -0800)]
Remove use of old theme name.
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
Dianne Hackborn [Sat, 22 Jan 2011 19:52:53 +0000 (11:52 -0800)]
am
e6354845: Merge "Monkey: request am to show the ANR dialog"
* commit '
e635484562dc7f21aa16de3147a100210708c8f8':
Monkey: request am to show the ANR dialog
Dianne Hackborn [Sat, 22 Jan 2011 19:36:43 +0000 (11:36 -0800)]
Merge "Monkey: request am to show the ANR dialog"
Vairavan Srinivasan [Sat, 22 Jan 2011 02:00:52 +0000 (18:00 -0800)]
Monkey: request am to show the ANR dialog
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.
Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
Skyler Kaufman [Sat, 22 Jan 2011 00:11:46 +0000 (16:11 -0800)]
am
8215de78: am
e2a6258c: Merge "A tiny http server to test source.android.com changes"
* commit '
8215de789a5678f67bc5fc4af062b151263eabdd':
A tiny http server to test source.android.com changes
Alexander Lucas [Fri, 21 Jan 2011 23:50:36 +0000 (15:50 -0800)]
am
32d902cd: am
a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '
32d902cd114dc3132f30db71ca954804b5548345':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
Nick Pelly [Fri, 21 Jan 2011 18:51:18 +0000 (10:51 -0800)]
am
072bca5b: Add Tag app to eclipse classpath
* commit '
072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
Add Tag app to eclipse classpath
Nick Pelly [Fri, 21 Jan 2011 18:12:17 +0000 (10:12 -0800)]
Add Tag app to eclipse classpath
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
Jeff Brown [Fri, 21 Jan 2011 05:46:27 +0000 (21:46 -0800)]
am
98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit '
98ab321927f1ea9ebb7ba6b5506ac6748b005555':
Prevent monkey from turning off the screen. (DO NOT MERGE)
Ed Heyl [Fri, 21 Jan 2011 05:42:01 +0000 (21:42 -0800)]
am
fd6a2b4d: Merge "Really don\'t send POWER or ENDCALL." into honeycomb
* commit '
fd6a2b4d2552f4a6179ac6f5f499e48310a8d813':
Really don't send POWER or ENDCALL.
Adam Powell [Fri, 21 Jan 2011 05:41:58 +0000 (21:41 -0800)]
Ed Heyl [Fri, 21 Jan 2011 03:10:22 +0000 (19:10 -0800)]
Merge "Really don't send POWER or ENDCALL." into honeycomb
Adam Powell [Fri, 21 Jan 2011 02:36:37 +0000 (18:36 -0800)]
API change - bug
3370353 and bug
3370338
Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
Jeff Brown [Thu, 20 Jan 2011 03:38:03 +0000 (19:38 -0800)]
Prevent monkey from turning off the screen. (DO NOT MERGE)
Bug:
3371251
Change-Id: I33005005fadc0f994f39fded10faafe21116f82a
Jeff Brown [Fri, 21 Jan 2011 01:41:18 +0000 (17:41 -0800)]
Really don't send POWER or ENDCALL.
Change-Id: If55c6bc7565a9a6b493da16fac5c7ad3c621684f
Yu Shan Emily Lau [Thu, 20 Jan 2011 18:24:24 +0000 (10:24 -0800)]
am
080c2376: Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736" into honeycomb
* commit '
080c237638a38c1bd2fa8d079cbbee0b5f23d956':
Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736
Yu Shan Emily Lau [Thu, 20 Jan 2011 18:21:37 +0000 (10:21 -0800)]
Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736" into honeycomb
Jeff Brown [Thu, 20 Jan 2011 03:59:04 +0000 (19:59 -0800)]
am
eddcd118: Merge "Prevent monkey from turning off the screen." into honeycomb
* commit '
eddcd1186b05b9b425ae765e98882a1815e3ac4d':
Prevent monkey from turning off the screen.
Jeff Brown [Thu, 20 Jan 2011 03:56:18 +0000 (19:56 -0800)]
Merge "Prevent monkey from turning off the screen." into honeycomb
Jeff Brown [Thu, 20 Jan 2011 03:38:03 +0000 (19:38 -0800)]
Prevent monkey from turning off the screen.
Bug:
3371251
Change-Id: Iadae29e8e4a67052746b8e2d2f5f542e4ee6dcc5
Alexander Lucas [Thu, 20 Jan 2011 02:35:04 +0000 (18:35 -0800)]
am
11b83fd9: Merge "Added Honeycomb Gallery sample application." into honeycomb
* commit '
11b83fd9f791496410a28f3db95bb27c0873c6fd':
Added Honeycomb Gallery sample application.
Alexander Lucas [Thu, 20 Jan 2011 02:33:28 +0000 (18:33 -0800)]
Merge "Added Honeycomb Gallery sample application." into honeycomb
Alexander Lucas [Wed, 12 Jan 2011 01:24:40 +0000 (17:24 -0800)]
Added Honeycomb Gallery sample application.
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
Trevor Johns [Wed, 19 Jan 2011 23:26:53 +0000 (15:26 -0800)]
am
953dbee4: Merge "NFC sample app" into honeycomb
* commit '
953dbee407ebffd4bd340aac5dc5aea469fa2bdf':
NFC sample app
Trevor Johns [Wed, 19 Jan 2011 23:23:41 +0000 (15:23 -0800)]
Merge "NFC sample app" into honeycomb
Fabrice Di Meglio [Wed, 19 Jan 2011 22:33:57 +0000 (14:33 -0800)]
am
791c7542: Merge "Update account tester" into honeycomb
* commit '
791c75424600614d0f8604c54fad4ba80ee57794':
Update account tester
Fabrice Di Meglio [Wed, 19 Jan 2011 22:30:52 +0000 (14:30 -0800)]
Merge "Update account tester" into honeycomb
Megha Joshi [Wed, 3 Nov 2010 06:27:24 +0000 (23:27 -0700)]
NFC sample app
Cherry-picking NFC sample into Honeycomb branch, since it wasn't
merged during it's original commit to Gingerbread.
Change-Id: I79308f04c1b2edd6cb5bb675fa13b9e5083a8432
Xavier Ducrohet [Wed, 19 Jan 2011 20:42:48 +0000 (12:42 -0800)]
am
ede325fe: Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
* commit '
ede325fe5a2beca79adac09f17adef7e9d72afaf':
HC preview & GB 2.3.1 use platform-tools rev 2.
Xavier Ducrohet [Wed, 19 Jan 2011 20:41:19 +0000 (12:41 -0800)]
Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
Jaikumar Ganesh [Wed, 19 Jan 2011 18:42:28 +0000 (10:42 -0800)]
am
7844a14f: Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
* commit '
7844a14f5525ca0bd47a9b6b73e040003dd47890':
Modify Bluetooth Chat app for new insecure rfcomm API.
Jaikumar Ganesh [Wed, 19 Jan 2011 18:40:43 +0000 (10:40 -0800)]
Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
Jaikumar Ganesh [Fri, 14 Jan 2011 19:08:58 +0000 (11:08 -0800)]
Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Change-Id: I2e20a3b02fb904d64e03a2c4602a5b724912c742
Skyler Kaufman [Wed, 19 Jan 2011 17:53:02 +0000 (09:53 -0800)]
am
e2a6258c: Merge "A tiny http server to test source.android.com changes"
* commit '
e2a6258c42eba4c4f6aeb33872034a17275f0c89':
A tiny http server to test source.android.com changes
Skyler Kaufman [Wed, 19 Jan 2011 17:34:34 +0000 (09:34 -0800)]
Merge "A tiny http server to test source.android.com changes"
Raphael [Wed, 19 Jan 2011 07:06:25 +0000 (23:06 -0800)]
HC preview & GB 2.3.1 use platform-tools rev 2.
Change-Id: Ib2dc3165f88b4c3bd3ba31a956ddb983ea496f2b
Xavier Ducrohet [Wed, 19 Jan 2011 02:40:59 +0000 (18:40 -0800)]
am
91946fe8: Merge "Add RenderScript samples to the SDK." into honeycomb
* commit '
91946fe86a7c1f481796d8e0b0f219f457db5750':
Add RenderScript samples to the SDK.
Xavier Ducrohet [Wed, 19 Jan 2011 02:13:34 +0000 (18:13 -0800)]
Merge "Add RenderScript samples to the SDK." into honeycomb
Alexander Lucas [Wed, 19 Jan 2011 02:07:11 +0000 (18:07 -0800)]
am
a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '
a057567484888f206cd70ecc2dcb269b16f23718':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
Alexander Lucas [Wed, 19 Jan 2011 02:04:38 +0000 (18:04 -0800)]
Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
Xavier Ducrohet [Wed, 19 Jan 2011 00:41:29 +0000 (16:41 -0800)]
Add RenderScript samples to the SDK.
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
Xavier Ducrohet [Tue, 18 Jan 2011 22:39:38 +0000 (14:39 -0800)]
am
7a3e7b1b: Update sdk.prop for the platform SDK component.
* commit '
7a3e7b1b9ad0a06744a1c76ae398f684dda7b2bf':
Update sdk.prop for the platform SDK component.
Xavier Ducrohet [Tue, 18 Jan 2011 22:21:55 +0000 (14:21 -0800)]
Update sdk.prop for the platform SDK component.
sdk.properties should be stored in development.git and
not sdk.git so move it here.
Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
Fabrice Di Meglio [Tue, 18 Jan 2011 01:37:55 +0000 (17:37 -0800)]
Update account tester
- update Theme to use default one
- AccountManager.getAuthTokenByFeatures() can be called thru a button
- code refactoring and cleaning
Change-Id: I1b4cfb340d9ed1506541fb9faf349f50d05df472
Jack Palevich [Tue, 18 Jan 2011 16:26:16 +0000 (08:26 -0800)]
am
6039b091: Merge "Add BasicGLSurfaceView sample." into honeycomb
* commit '
6039b0915ea44fcad503f33b6f0c9b27669f999c':
Add BasicGLSurfaceView sample.
Xavier Ducrohet [Tue, 18 Jan 2011 16:25:24 +0000 (08:25 -0800)]
am
959f517c: Merge "Remove illegal @Override on interface method." into honeycomb
* commit '
959f517c248d3c6726b4bd7126317332da7696a1':
Remove illegal @Override on interface method.
Xavier Ducrohet [Tue, 18 Jan 2011 16:25:19 +0000 (08:25 -0800)]
am
e21f4d69: Merge "Update the API level of the Honeycomb samples." into honeycomb
* commit '
e21f4d695a3bdac4cb81127a2bd41555a4c940be':
Update the API level of the Honeycomb samples.
Winson Chung [Tue, 18 Jan 2011 15:33:29 +0000 (07:33 -0800)]
Jack Palevich [Tue, 18 Jan 2011 10:42:31 +0000 (02:42 -0800)]
Merge "Add BasicGLSurfaceView sample." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 05:51:43 +0000 (21:51 -0800)]
Merge "Remove illegal @Override on interface method." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 05:51:39 +0000 (21:51 -0800)]
Merge "Update the API level of the Honeycomb samples." into honeycomb
Dianne Hackborn [Tue, 18 Jan 2011 04:00:58 +0000 (20:00 -0800)]
am
0d11c9c3: Follow API changes.
* commit '
0d11c9c34501a9a9dedee1092fd63af218dc28c8':
Follow API changes.
Jack Palevich [Tue, 18 Jan 2011 01:48:44 +0000 (17:48 -0800)]
Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.
Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
Jack Palevich [Tue, 18 Jan 2011 01:45:02 +0000 (17:45 -0800)]
am
2fd42883: am
5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '
2fd4288383e8af566d8d423eb606f8fd98a21d8f':
Add BasicGLSurfaceView sample.
Jack Palevich [Tue, 18 Jan 2011 01:42:56 +0000 (17:42 -0800)]
am
5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '
5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
Jack Palevich [Tue, 18 Jan 2011 01:39:43 +0000 (17:39 -0800)]
Merge "Add BasicGLSurfaceView sample." into gingerbread
Winson Chung [Tue, 18 Jan 2011 01:13:31 +0000 (17:13 -0800)]
Fixing typo.
Change-Id: I7e16ed4713d9bc2c2263e526e46c54a1f85b952c
Xavier Ducrohet [Tue, 18 Jan 2011 01:05:05 +0000 (17:05 -0800)]
Remove illegal @Override on interface method.
Samples should compile with 1.5
Change-Id: I029ae9ded4237fd9d4d2d1dbf2c7c537afbbf36b
Xavier Ducrohet [Tue, 18 Jan 2011 00:58:04 +0000 (16:58 -0800)]
Update the API level of the Honeycomb samples.
Change-Id: I5f14d45474957e9ee35a058d7b6295c860335429
Dianne Hackborn [Mon, 17 Jan 2011 20:31:08 +0000 (12:31 -0800)]
Follow API changes.
Change-Id: Ieb1df7fc0708f22aae3d851f74ade1343eb44e08
Andy Stadler [Mon, 17 Jan 2011 20:56:21 +0000 (12:56 -0800)]
am
d8865cc3: Update demo for DPM encryption controls
* commit '
d8865cc32c917cebf1fc65c8266d939b9a5718a7':
Update demo for DPM encryption controls
Andy Stadler [Mon, 17 Jan 2011 20:53:31 +0000 (12:53 -0800)]
Update demo for DPM encryption controls
* Follow revised API
* Show more status
Bug:
3346770
Change-Id: I6c5cd8d8f055ceb3a3a78cf3868dbc0f2d535acf
Xavier Ducrohet [Mon, 17 Jan 2011 03:44:38 +0000 (19:44 -0800)]
am
8841bf1d: (-s ours) am
7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
* commit '
8841bf1d41f8bc2dee32d881121e1a1c9a15664a':
Move SDK component to 2.4 - DO NOT MERGE.
Xavier Ducrohet [Mon, 17 Jan 2011 03:42:37 +0000 (19:42 -0800)]
am
7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
* commit '
7eada54037b5476bfc1cc4a3e8933defa0b04096':
Move SDK component to 2.4 - DO NOT MERGE.
Xavier Ducrohet [Mon, 17 Jan 2011 03:40:38 +0000 (19:40 -0800)]
am
ac70efe3: Merge "Move SDK component to API 10 + codename." into honeycomb
* commit '
ac70efe3445dc697c521853af382624af63da457':
Move SDK component to API 10 + codename.
Xavier Ducrohet [Mon, 17 Jan 2011 03:40:36 +0000 (19:40 -0800)]
am
ae71adc7: Merge "Fix WXGA skin" into honeycomb
* commit '
ae71adc7c815cc3965e424b6c8f9d93a4fd0af12':
Fix WXGA skin
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:59 +0000 (19:38 -0800)]
Merge "Move SDK component to API 10 + codename." into honeycomb
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:51 +0000 (19:38 -0800)]
Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:41 +0000 (19:38 -0800)]
Merge "Fix WXGA skin" into honeycomb
Xavier Ducrohet [Mon, 17 Jan 2011 03:18:16 +0000 (19:18 -0800)]
am
a67b557e: Merge "Add RS includes to the SDK and update skin list." into honeycomb
* commit '
a67b557e13a11afc84beed873c7be4f2fac59643':
Add RS includes to the SDK and update skin list.
Xavier Ducrohet [Mon, 17 Jan 2011 03:16:16 +0000 (19:16 -0800)]
Merge "Add RS includes to the SDK and update skin list." into honeycomb
Winson Chung [Mon, 17 Jan 2011 01:58:38 +0000 (17:58 -0800)]
am
eb80909d: Adding WidgetPreview utility.
* commit '
eb80909dfc0d44d1bd6b38aea12b3740cea4efa9':
Adding WidgetPreview utility.
Winson Chung [Mon, 17 Jan 2011 01:12:47 +0000 (17:12 -0800)]
Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
Xavier Ducrohet [Sun, 16 Jan 2011 23:27:25 +0000 (15:27 -0800)]
Move SDK component to API 10 + codename.
Change-Id: If6c739a082c3c631de62d3c0db7615bcf29b4126
Xavier Ducrohet [Sun, 16 Jan 2011 23:23:40 +0000 (15:23 -0800)]
Move SDK component to 2.4 - DO NOT MERGE.
Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
Dianne Hackborn [Sun, 16 Jan 2011 22:49:50 +0000 (14:49 -0800)]
am
e63a4b58: Add some more API demos for themes.
* commit '
e63a4b58a26cdce8b62984c83763dafdf282895b':
Add some more API demos for themes.
Dianne Hackborn [Sun, 16 Jan 2011 22:28:13 +0000 (14:28 -0800)]
Add some more API demos for themes.
Shows how to make a basic custom theme with a custom background,
and a theme that selects between the old theme and Holo.
Also use a little trick to make the API demos for HC specific
samples be hidden on older versions of the platform.
Change-Id: Ie53e8103147e81975fca73b96bda989a00504534
Xavier Ducrohet [Fri, 14 Jan 2011 19:11:31 +0000 (11:11 -0800)]
Fix WXGA skin
Change-Id: Ia283c1f9774318661c7164fdb9da70c72bb26bdc
Xavier Ducrohet [Sun, 16 Jan 2011 21:21:52 +0000 (13:21 -0800)]
Add RS includes to the SDK and update skin list.
Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
Jaikumar Ganesh [Sat, 15 Jan 2011 05:30:01 +0000 (21:30 -0800)]
am
0d799e09: (-s ours) am
1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
* commit '
0d799e0964368f67b6ec1d6d3fac90d061a7d160':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Elliott Hughes [Sat, 15 Jan 2011 05:29:17 +0000 (21:29 -0800)]
am
47081d8f: am
ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
* commit '
47081d8f5878ca5e2ee6c52a92401498a72323f4':
Minor doc fixes (mainly the infamous "repo init-u").
Jack Palevich [Sat, 15 Jan 2011 03:27:56 +0000 (19:27 -0800)]
Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.
Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
Yu Shan Emily Lau [Sat, 15 Jan 2011 03:25:11 +0000 (19:25 -0800)]
Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736
Change-Id: I82dc5d28a218f8e2a6e7c13f27a4aca398cd904d
Jaikumar Ganesh [Sat, 15 Jan 2011 00:13:36 +0000 (16:13 -0800)]
am
1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
* commit '
1b6086207f2b06fb2647428e6210c2aefc6a930a':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Jaikumar Ganesh [Sat, 15 Jan 2011 00:11:35 +0000 (16:11 -0800)]
Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
Elliott Hughes [Fri, 14 Jan 2011 22:21:04 +0000 (14:21 -0800)]
am
ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
* commit '
ed6b76c670658390a43e199f9dc199d85483300a':
Minor doc fixes (mainly the infamous "repo init-u").
Elliott Hughes [Fri, 14 Jan 2011 22:19:03 +0000 (14:19 -0800)]
Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
Jaikumar Ganesh [Fri, 14 Jan 2011 19:08:58 +0000 (11:08 -0800)]
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Bug:
3352266
Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
OSDN Git Service
