OSDN Git Service
Glenn Kasten [Mon, 19 Dec 2011 21:55:34 +0000 (13:55 -0800)]
Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
Kenny Root [Fri, 13 Jan 2012 21:39:28 +0000 (13:39 -0800)]
resolved conflicts for merge of
e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
Kenny Root [Fri, 13 Jan 2012 21:12:34 +0000 (13:12 -0800)]
am
2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '
2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 21:01:48 +0000 (13:01 -0800)]
am
10065177: am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
100651779fde99f7ae2a10719d688b51115f08e9':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:58:45 +0000 (12:58 -0800)]
am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:37:53 +0000 (12:37 -0800)]
am
bcce2a19: am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:35:07 +0000 (12:35 -0800)]
am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 20:18:55 +0000 (12:18 -0800)]
am
89620c5d: am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
89620c5d982858f590f3740169c9f69ee380be3e':
Streamline package-installed handling by the Backup Manager
Romain Guy [Fri, 13 Jan 2012 20:13:52 +0000 (12:13 -0800)]
Merge "Remove unused parameter"
Christopher Tate [Fri, 13 Jan 2012 20:08:09 +0000 (12:08 -0800)]
am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:41:01 +0000 (11:41 -0800)]
am
e6572304: am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:39:03 +0000 (11:39 -0800)]
am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:28:09 +0000 (11:28 -0800)]
am
c0ef548c: am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Robert Ly [Fri, 13 Jan 2012 19:20:43 +0000 (11:20 -0800)]
am
7da0abc5: am
62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '
7da0abc52e3cbdeeb7fae0d22895710254ef9ec4':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
Robert Ly [Fri, 13 Jan 2012 19:09:27 +0000 (11:09 -0800)]
am
62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '
62472581c30a3202b7bbd86e644b4346d5a4e65c':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
Alon Albert [Fri, 13 Jan 2012 18:35:53 +0000 (10:35 -0800)]
Merge "New command to request a sync"
Robert Ly [Fri, 13 Jan 2012 18:13:14 +0000 (10:13 -0800)]
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 15:48:55 +0000 (07:48 -0800)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Guang Zhu [Fri, 13 Jan 2012 05:00:15 +0000 (21:00 -0800)]
Merge "Move where prop dev.bootcomplete is set"
Bart Sears [Fri, 13 Jan 2012 03:20:05 +0000 (19:20 -0800)]
Merge "Add glyphs for Vertical Text"
Mathias Agopian [Fri, 13 Jan 2012 02:49:07 +0000 (18:49 -0800)]
Merge "fix a bug with vsync management"
Ken Wakasa [Fri, 13 Jan 2012 02:15:42 +0000 (18:15 -0800)]
Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API"
Alon Albert [Fri, 13 Jan 2012 01:39:37 +0000 (17:39 -0800)]
Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero"
James Dong [Fri, 13 Jan 2012 00:56:58 +0000 (16:56 -0800)]
Merge "Separate sniffing from session initialization"
Adam Cohen [Fri, 13 Jan 2012 00:47:00 +0000 (16:47 -0800)]
Merge "Getting rid of hack where the wallpaper offset was being deferred"
Mathias Agopian [Fri, 13 Jan 2012 00:13:54 +0000 (16:13 -0800)]
fix a bug with vsync management
this bug was introduced recently. we were signaling *all* clients
regardless of the vsync rate.
Change-Id: I2ae8a6c820a390f602382596ba75e8ed737fb2ef
Scott Main [Thu, 12 Jan 2012 23:49:34 +0000 (15:49 -0800)]
am
cea3892b: am
722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '
cea3892bd7fdf605d51a7f99aa0d20dfbea80dd3':
docs: make AD logo clickable on home page
Scott Main [Thu, 12 Jan 2012 23:47:15 +0000 (15:47 -0800)]
am
722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '
722c8c02f1e17c232b041440ea97a2fda336a6e8':
docs: make AD logo clickable on home page
Scott Main [Thu, 12 Jan 2012 23:44:53 +0000 (15:44 -0800)]
Merge "docs: make AD logo clickable on home page" into ics-mr1
Svetoslav Ganov [Thu, 12 Jan 2012 23:36:58 +0000 (15:36 -0800)]
Merge "AccessibilityService description not internationalized."
Jeff Brown [Thu, 12 Jan 2012 23:03:26 +0000 (15:03 -0800)]
Merge "Rewrite SQLite database wrappers."
Jeff Brown [Thu, 12 Jan 2012 22:59:30 +0000 (14:59 -0800)]
Merge "Fix indentation and whitespace."
Jeff Brown [Thu, 12 Jan 2012 22:59:11 +0000 (14:59 -0800)]
Merge "Clean up database tests a little bit."
Chia-chi Yeh [Thu, 12 Jan 2012 22:30:44 +0000 (14:30 -0800)]
am
1e9e7f76: am
ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '
1e9e7f76d5e6187befaf96eece258c27fd08bdc5':
VPN: silence VPN notifications.
Chia-chi Yeh [Thu, 12 Jan 2012 22:26:43 +0000 (14:26 -0800)]
am
ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '
ff321d496a6a07fc667112ecfe4d9a107d44147b':
VPN: silence VPN notifications.
Chia-chi Yeh [Thu, 12 Jan 2012 22:24:30 +0000 (14:24 -0800)]
Merge "VPN: silence VPN notifications." into ics-mr1
Gilles Debunne [Thu, 12 Jan 2012 22:21:58 +0000 (14:21 -0800)]
Merge "Fixed fadingEdge documentation"
Roman Nurik [Thu, 12 Jan 2012 22:11:01 +0000 (14:11 -0800)]
am
4ecb2633: am
aaaafca8: docs: Android design CSS/JS fixes
* commit '
4ecb2633981d0d58421562ca379a5c79adb413a0':
docs: Android design CSS/JS fixes
Roman Nurik [Thu, 12 Jan 2012 22:07:51 +0000 (14:07 -0800)]
am
aaaafca8: docs: Android design CSS/JS fixes
* commit '
aaaafca8543eaa75f1865d70c801c9b62caa56e2':
docs: Android design CSS/JS fixes
Roman Nurik [Thu, 12 Jan 2012 21:38:01 +0000 (13:38 -0800)]
am
0786bc73: am
baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '
0786bc734e55b40a16d1a475f311c5460ff55d36':
docs: minor Design Principles fixes for Android Design
Jim Miller [Thu, 12 Jan 2012 21:37:58 +0000 (13:37 -0800)]
am
1aff11be: am
7a286d83: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
1aff11be4585d6ddff784d7e74188963050805fa':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Daniel Sandler [Thu, 12 Jan 2012 21:37:54 +0000 (13:37 -0800)]
am
66e66e1d: am
755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '
66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
Clean up wifi/mobile indicators in the expanded panel.
Scott Main [Thu, 12 Jan 2012 21:37:41 +0000 (13:37 -0800)]
am
499b9441: am
cf602dbd: docs: replace "decide for me image" bug:
5860467
* commit '
499b944133298b4da344fbf97cff25c6f6b9d62f':
docs: replace "decide for me image" bug:
5860467
Roman Nurik [Thu, 12 Jan 2012 20:46:50 +0000 (12:46 -0800)]
am
baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '
baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
docs: minor Design Principles fixes for Android Design
Roman Nurik [Thu, 12 Jan 2012 20:45:00 +0000 (12:45 -0800)]
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Jim Miller [Thu, 12 Jan 2012 20:31:07 +0000 (12:31 -0800)]
am
7a286d83: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
7a286d8391a58637e6834f4de296bf66183ce1b2':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Thu, 12 Jan 2012 20:28:59 +0000 (12:28 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Daniel Sandler [Thu, 12 Jan 2012 19:40:43 +0000 (11:40 -0800)]
am
755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '
755a967bdc2cddb6fbadd10e357f8a5328520061':
Clean up wifi/mobile indicators in the expanded panel.
Daniel Sandler [Thu, 12 Jan 2012 19:38:39 +0000 (11:38 -0800)]
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:35:54 +0000 (11:35 -0800)]
am
cf602dbd: docs: replace "decide for me image" bug:
5860467
* commit '
cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
docs: replace "decide for me image" bug:
5860467
Matthew Xie [Thu, 12 Jan 2012 19:29:39 +0000 (11:29 -0800)]
am
1890fa82: am
79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '
1890fa822091ea700b7409ac79a57cf650b55003':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Matthew Xie [Thu, 12 Jan 2012 19:27:10 +0000 (11:27 -0800)]
am
79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '
79d84930cd776c7173330eeb13b3282b6034fc37':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Scott Main [Thu, 12 Jan 2012 19:26:49 +0000 (11:26 -0800)]
am
db4296bd: am
a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
* commit '
db4296bde95352b6bb5614fad3b08ffaa49dd9c3':
docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519
Scott Main [Thu, 12 Jan 2012 19:24:24 +0000 (11:24 -0800)]
am
a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
* commit '
a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519
Matthew Xie [Thu, 12 Jan 2012 19:24:06 +0000 (11:24 -0800)]
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:23:11 +0000 (11:23 -0800)]
am
b2ff327c: am
abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
* commit '
b2ff327cb41185030077189bc3e80376acf11c68':
docs: further clarify the behavior of targetSdkVersion bug:
5854083
Scott Main [Thu, 12 Jan 2012 19:22:24 +0000 (11:22 -0800)]
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:21:02 +0000 (11:21 -0800)]
am
abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
* commit '
abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
docs: further clarify the behavior of targetSdkVersion bug:
5854083
Scott Main [Thu, 12 Jan 2012 19:19:08 +0000 (11:19 -0800)]
Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
John Reck [Thu, 12 Jan 2012 19:07:16 +0000 (11:07 -0800)]
John Reck [Thu, 12 Jan 2012 19:03:06 +0000 (11:03 -0800)]
am
baaf136c: am
0a3fcc3e: Fix Apache stack
* commit '
baaf136cd279e22a7ae4b551ebd5fad23b84996d':
Fix Apache stack
John Reck [Thu, 12 Jan 2012 19:00:17 +0000 (11:00 -0800)]
am
0a3fcc3e: Fix Apache stack
* commit '
0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
Fix Apache stack
Michael Jurka [Thu, 12 Jan 2012 18:41:32 +0000 (10:41 -0800)]
Merge "Fix NPE in Recent Apps"
Mathias Agopian [Thu, 12 Jan 2012 18:37:10 +0000 (10:37 -0800)]
Merge "remove dead/usnused code"
Mathias Agopian [Thu, 12 Jan 2012 18:36:39 +0000 (10:36 -0800)]
Merge "Fix an issue with VSYNC"
Glenn Kasten [Thu, 12 Jan 2012 18:30:28 +0000 (10:30 -0800)]
Merge "Use audio_format_t consistently"
Robert Greenwalt [Thu, 12 Jan 2012 17:29:30 +0000 (09:29 -0800)]
am
1800ccfa: am
4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '
1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
Robert Greenwalt [Thu, 12 Jan 2012 17:26:48 +0000 (09:26 -0800)]
am
4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '
4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
Robert Greenwalt [Thu, 12 Jan 2012 17:25:25 +0000 (09:25 -0800)]
Merge "Ignore case on apn type strings."
Robert Greenwalt [Thu, 12 Jan 2012 17:24:45 +0000 (09:24 -0800)]
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
The Android Open Source Project [Thu, 12 Jan 2012 17:00:21 +0000 (09:00 -0800)]
am
ce77af47: Reconcile with ics-mr1-release
* commit '
ce77af47e979d365155e4003ca2943b639600e73':
The Android Open Source Project [Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Marco Nelissen [Thu, 12 Jan 2012 15:49:23 +0000 (07:49 -0800)]
Merge "MediaScanner: Disable bulk insert for settings"
Michael Jurka [Thu, 12 Jan 2012 15:35:43 +0000 (07:35 -0800)]
Merge "Speeding up System UI pressed anim"
Danielle Millett [Thu, 12 Jan 2012 15:33:47 +0000 (07:33 -0800)]
am
63faf6c6: (-s ours) am
2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '
63faf6c66ff129da9e431dbafd1170a14aedb259':
DO NOT MERGE - Cherry picking from master to MR1
Danielle Millett [Thu, 12 Jan 2012 15:31:37 +0000 (07:31 -0800)]
am
2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '
2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
Danielle Millett [Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)]
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
Brian Colonna [Thu, 12 Jan 2012 14:37:14 +0000 (06:37 -0800)]
am
2cd0a0e5: (-s ours) am
8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '
2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
DO NOT MERGE cherry-picked FU framework tablet commits
Brian Colonna [Thu, 12 Jan 2012 14:35:27 +0000 (06:35 -0800)]
am
8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '
8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
Brian Colonna [Thu, 12 Jan 2012 14:33:49 +0000 (06:33 -0800)]
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
Mathias Agopian [Fri, 6 Jan 2012 23:54:37 +0000 (15:54 -0800)]
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
Mathias Agopian [Tue, 10 Jan 2012 02:19:18 +0000 (18:19 -0800)]
Fix an issue with VSYNC
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().
Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
satok [Thu, 12 Jan 2012 05:14:23 +0000 (21:14 -0800)]
Merge "Make public SpellChecker utilities"
Irfan Sheriff [Thu, 12 Jan 2012 04:33:11 +0000 (20:33 -0800)]
Merge "Sync up state with supplicant at start"
Xia Wang [Thu, 12 Jan 2012 01:57:16 +0000 (17:57 -0800)]
am
87badc20: am
4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
* commit '
87badc20c7d5462ee27f13adf50acaf6a3232884':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922
Xia Wang [Thu, 12 Jan 2012 01:57:14 +0000 (17:57 -0800)]
am
b18a7c3e: am
1446c7b2: Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
* commit '
b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
Get average value for image processing test bug#:
5566079
Xia Wang [Thu, 12 Jan 2012 01:53:38 +0000 (17:53 -0800)]
am
4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
* commit '
4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922
Xia Wang [Thu, 12 Jan 2012 01:53:36 +0000 (17:53 -0800)]
am
1446c7b2: Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
* commit '
1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#:
5566079
Xia Wang [Thu, 12 Jan 2012 01:52:06 +0000 (17:52 -0800)]
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:51:48 +0000 (17:51 -0800)]
Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
Katie McCormick [Thu, 12 Jan 2012 00:45:00 +0000 (16:45 -0800)]
am
3808f8cc: am
6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '
3808f8ccec18f7b04ef983d553fb10f3e2983216':
Doc change: Adding Bluetooth HDP info.
Katie McCormick [Thu, 12 Jan 2012 00:42:29 +0000 (16:42 -0800)]
am
6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '
6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
Katie McCormick [Thu, 12 Jan 2012 00:40:37 +0000 (16:40 -0800)]
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
OSDN Git Service
