OSDN Git Service
Jason Sams [Thu, 21 Apr 2011 00:15:05 +0000 (17:15 -0700)]
Merge "Remove accidental logging."
Jason Sams [Wed, 20 Apr 2011 22:13:46 +0000 (15:13 -0700)]
Merge "Create runtime stubs for compute driver."
Andreas Huber [Wed, 20 Apr 2011 19:23:27 +0000 (12:23 -0700)]
Merge "Unhide MediaPlayer's setDataSource method that takes optional http headers to be"
Wink Saville [Wed, 20 Apr 2011 18:41:29 +0000 (11:41 -0700)]
am
a4017f8d: am
afa79585: Remove getCurrentDataConnectionList.
* commit '
a4017f8d1b0ac04873c5b0389d5a0cabe744a3f0':
Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 18:33:11 +0000 (11:33 -0700)]
am
afa79585: Remove getCurrentDataConnectionList.
* commit '
afa79585e0e517d9fdfe6065bc5084cab9bb2300':
Remove getCurrentDataConnectionList.
Fabrice Di Meglio [Wed, 20 Apr 2011 18:16:35 +0000 (11:16 -0700)]
Merge "Use Harfbuzz for Paint drawText / measureText / breakText APIs"
Dianne Hackborn [Wed, 20 Apr 2011 17:32:32 +0000 (10:32 -0700)]
Merge "Deprecate a bunch of APIs."
Steve Block [Wed, 20 Apr 2011 17:27:37 +0000 (10:27 -0700)]
Merge "Deprecate ANCHOR_TYPE and IMAGE_ANCHOR_TYPE from WebView.HitTestResult"
Andreas Huber [Wed, 20 Apr 2011 16:23:52 +0000 (09:23 -0700)]
Merge "Add extra headers specified in the media player's setDataSource call"
Jeff Brown [Wed, 20 Apr 2011 06:58:27 +0000 (23:58 -0700)]
Merge "Track unhandled input events in consistency verifiers."
Jeff Brown [Wed, 20 Apr 2011 04:28:35 +0000 (21:28 -0700)]
Merge "Add tap/drag touchpad gesture."
Adam Powell [Wed, 20 Apr 2011 01:45:42 +0000 (18:45 -0700)]
Merge "Refactor menu internals."
Mathias Agopian [Wed, 20 Apr 2011 01:19:15 +0000 (18:19 -0700)]
Merge "remove support for console in SurfaceFlinger"
Jaikumar Ganesh [Tue, 19 Apr 2011 23:04:38 +0000 (16:04 -0700)]
am
ee1c033f: am
24a16e6c: am
c34c88b9: am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
ee1c033f6e0c2e709bd63adb419de3c5212fdf8f':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 23:01:36 +0000 (16:01 -0700)]
am
24a16e6c: am
c34c88b9: am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
24a16e6c53d9b45c0cfdf150425002adc919955b':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 22:57:24 +0000 (15:57 -0700)]
am
c34c88b9: am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
c34c88b948cb60c057bd2145df9f1b2091f3c894':
Unable to push files to Windows 7
David Li [Tue, 19 Apr 2011 22:50:32 +0000 (15:50 -0700)]
Merge "GLES2Dbg: send some GL implementation constants to client"
Jeff Brown [Tue, 19 Apr 2011 22:37:32 +0000 (15:37 -0700)]
Merge "Initial checkin of spot presentation for touchpad gestures."
Jeff Brown [Wed, 13 Apr 2011 05:39:53 +0000 (22:39 -0700)]
Initial checkin of spot presentation for touchpad gestures.
Added a new PointerIcon API (hidden for now) for loading
pointer icons.
Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.
Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.
Removed the SpotController stub and folded its responsibilities
into PointerController.
Change-Id: I5126b1e69d95252fda7f2a684c9287e239a57163
Jaikumar Ganesh [Tue, 19 Apr 2011 22:28:26 +0000 (15:28 -0700)]
am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
Unable to push files to Windows 7
Marco Nelissen [Tue, 19 Apr 2011 22:25:48 +0000 (15:25 -0700)]
Merge "Fix bugs in ListView"
Jaikumar Ganesh [Tue, 19 Apr 2011 21:48:08 +0000 (14:48 -0700)]
Merge "Unable to push files to Windows 7"
David Li [Fri, 15 Apr 2011 22:35:10 +0000 (15:35 -0700)]
GLES2Dbg: send some GL implementation constants to client
Change-Id: Ic6c51c09b1c3d2e1e1a28c6ed552714c3243827c
Signed-off-by: David Li <davidxli@google.com>
David Li [Thu, 14 Apr 2011 18:20:22 +0000 (11:20 -0700)]
GLES2Dbg: initial tests
Change-Id: Ibf07eff68d39267fd5c9bec2870f59a5ae2f51e3
Fabrice Di Meglio [Tue, 19 Apr 2011 20:14:46 +0000 (13:14 -0700)]
Merge "Use Harfbuzz for Canvas drawText APIs"
Narayan Kamath [Tue, 19 Apr 2011 17:44:16 +0000 (10:44 -0700)]
Merge "Fix onCompleteAudioAvailable"
Andreas Huber [Tue, 19 Apr 2011 17:42:19 +0000 (10:42 -0700)]
Merge "Make sure a read restarts the prefetcher if necessary."
Amith Yamasani [Tue, 19 Apr 2011 17:41:20 +0000 (10:41 -0700)]
Merge "Plumbing in PackageManager and installd for multi-user support."
Nick Kralevich [Tue, 19 Apr 2011 17:10:54 +0000 (10:10 -0700)]
Merge "Make installd resistant to umask changes."
Irfan Sheriff [Tue, 19 Apr 2011 17:03:07 +0000 (10:03 -0700)]
Merge "handle supplicant stop after child states exit"
Andreas Huber [Tue, 19 Apr 2011 17:01:00 +0000 (10:01 -0700)]
Merge "Remove streamability verification, it's taking too long. Also..."
Bjorn Bringert [Tue, 19 Apr 2011 10:06:13 +0000 (03:06 -0700)]
Merge "TTS: SynthesisRequest.error() instead of return value"
Mathias Agopian [Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)]
Merge "changes to SurfaceTexture needed for unification with SF"
Mathias Agopian [Mon, 18 Apr 2011 23:25:40 +0000 (16:25 -0700)]
remove support for console in SurfaceFlinger
the only supported screen management api now is
/sys/power/wait_for_fb_{sleep|wake}
Change-Id: I6c7d8d54843da4980b1b38ee3d46cf19be275240
Fabrice Di Meglio [Tue, 19 Apr 2011 00:19:36 +0000 (17:19 -0700)]
Merge "Return chars advances instead of glyphs advances"
Mathias Agopian [Mon, 18 Apr 2011 23:00:07 +0000 (16:00 -0700)]
Merge "fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS"
Mathias Agopian [Mon, 18 Apr 2011 22:59:24 +0000 (15:59 -0700)]
fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS
Change-Id: I2e0b1eac6dbc6a4ecbbaf31013aa02cf2369fce2
Andreas Huber [Mon, 18 Apr 2011 22:49:06 +0000 (15:49 -0700)]
am
67dc13ed: (-s ours) am
5ce9eb9a: (-s ours) am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
67dc13ed6764cd96194f57ee8221c88df551d040':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Andreas Huber [Mon, 18 Apr 2011 22:45:21 +0000 (15:45 -0700)]
am
5ce9eb9a: (-s ours) am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
5ce9eb9a34ffac3ff5aea0db81a902a380105d5b':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Wink Saville [Mon, 18 Apr 2011 22:28:47 +0000 (15:28 -0700)]
am
37677849: am
64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
* commit '
37677849998e6c9a39afe0a730b2f0131a371f3b':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
David Li [Mon, 18 Apr 2011 22:26:59 +0000 (15:26 -0700)]
Merge "GLES2Dbg: added CaptureDraw and CaptureSwap options"
David Li [Mon, 18 Apr 2011 22:26:51 +0000 (15:26 -0700)]
Merge "GLES2Dbg: use dump.gles2dbg file when fails to create socket"
David Li [Mon, 18 Apr 2011 22:26:39 +0000 (15:26 -0700)]
Merge "GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol"
David Li [Mon, 18 Apr 2011 22:26:31 +0000 (15:26 -0700)]
Merge "GLES2Dbg: change GLES2_dbg to shared library"
Wink Saville [Mon, 18 Apr 2011 22:24:47 +0000 (15:24 -0700)]
am
64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
* commit '
64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
Dianne Hackborn [Mon, 18 Apr 2011 21:23:04 +0000 (14:23 -0700)]
Merge "Integrate from support lib: fix restore of list state."
Wink Saville [Mon, 18 Apr 2011 20:39:49 +0000 (13:39 -0700)]
am
9a2c9390: am
6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
* commit '
9a2c93905a2a65db7135f48ca5653d3cf614faed':
Data connection attempts/retries for multiple APNs
Wink Saville [Mon, 18 Apr 2011 20:36:32 +0000 (13:36 -0700)]
am
6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
* commit '
6f200f738ed0bbdef5c433b5f571fcb591e1760c':
Data connection attempts/retries for multiple APNs
Wink Saville [Mon, 18 Apr 2011 20:28:49 +0000 (13:28 -0700)]
Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
Bjorn Bringert [Mon, 18 Apr 2011 19:34:47 +0000 (12:34 -0700)]
Merge "Only return default TTS engines from TTS.getEngines()"
Jean-Michel Trivi [Mon, 18 Apr 2011 18:20:20 +0000 (11:20 -0700)]
Merge "Fix bug
2659754 ConcurrentModificationException in audio focus changes"
Fabrice Di Meglio [Mon, 18 Apr 2011 18:15:57 +0000 (11:15 -0700)]
Merge "Add Unicode BiDi Algo before drawing text in Canvas"
Jean-Michel Trivi [Mon, 18 Apr 2011 18:02:34 +0000 (11:02 -0700)]
Merge "Fix bug
2724503 Persist media button receiver across reboots"
Stephen Hines [Mon, 18 Apr 2011 17:25:57 +0000 (10:25 -0700)]
Merge "Fix broken assert (if input allocation is NULL)."
Andreas Huber [Mon, 18 Apr 2011 15:12:36 +0000 (08:12 -0700)]
Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"
Scott Main [Mon, 18 Apr 2011 10:28:26 +0000 (03:28 -0700)]
am
62174ac1: am
74c890a5: am
1f07f125: am
6669f251: docs: fix snippet errors in web doc
* commit '
62174ac1a203e2ab57fd91837e7e67b0c578ecbe':
docs: fix snippet errors in web doc
Scott Main [Mon, 18 Apr 2011 10:18:06 +0000 (03:18 -0700)]
am
74c890a5: am
1f07f125: am
6669f251: docs: fix snippet errors in web doc
* commit '
74c890a57a819a0245573987455088c111e2c4eb':
docs: fix snippet errors in web doc
Scott Main [Mon, 18 Apr 2011 10:08:32 +0000 (03:08 -0700)]
am
1f07f125: am
6669f251: docs: fix snippet errors in web doc
* commit '
1f07f1257b62f2ac71696bb430f9328597c3de27':
docs: fix snippet errors in web doc
Wink Saville [Sat, 16 Apr 2011 21:52:04 +0000 (14:52 -0700)]
am
5f7edb2c: am
a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
* commit '
5f7edb2c53b2432ea3426c563d9743338ba1d064':
Telephony: GDCT - Set enabled state before notification is sent out.
Wink Saville [Sat, 16 Apr 2011 21:50:10 +0000 (14:50 -0700)]
am
d86e06f7: am
df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
* commit '
d86e06f7db0705b5fa64f23dcecf305133d2acc7':
Telephony: Set Radio turned off reason when powered off.
Wink Saville [Sat, 16 Apr 2011 21:50:06 +0000 (14:50 -0700)]
am
fa65533e: am
dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
* commit '
fa65533ef11e794b21580e5583a74d2d8ffb7047':
Clean up calls immediately if cid become inactive in unsol data state changed
Wink Saville [Sat, 16 Apr 2011 21:49:07 +0000 (14:49 -0700)]
am
a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
* commit '
a9378485cb8d0968a9a177f730875e0f1d49d689':
Telephony: GDCT - Set enabled state before notification is sent out.
Wink Saville [Sat, 16 Apr 2011 21:48:10 +0000 (14:48 -0700)]
am
6708e008: am
585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
* commit '
6708e008ef29b5221960d3b42ca8fcc192108192':
handle missing constants when creating a Phone instance
Ramesh Sudini [Sat, 16 Apr 2011 21:47:56 +0000 (14:47 -0700)]
am
dff90b7d: am
a5c9c724: Data Availability Indication changes.
* commit '
dff90b7d161bd7d11d931a43aad79d87e7f4dfc1':
Data Availability Indication changes.
Wink Saville [Sat, 16 Apr 2011 21:47:17 +0000 (14:47 -0700)]
am
df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
* commit '
df43e321778a02f9eaeb8faacf4ae7917c434106':
Telephony: Set Radio turned off reason when powered off.
Wink Saville [Sat, 16 Apr 2011 21:47:15 +0000 (14:47 -0700)]
am
dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
* commit '
dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4':
Clean up calls immediately if cid become inactive in unsol data state changed
Wink Saville [Sat, 16 Apr 2011 21:45:42 +0000 (14:45 -0700)]
Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
Wink Saville [Sat, 16 Apr 2011 21:45:28 +0000 (14:45 -0700)]
am
585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
* commit '
585b7acb16183ae31e71912dc2bfceea421be157':
handle missing constants when creating a Phone instance
Ramesh Sudini [Sat, 16 Apr 2011 21:45:19 +0000 (14:45 -0700)]
am
a5c9c724: Data Availability Indication changes.
* commit '
a5c9c7246b065710227395ec4a7c1df0168363ef':
Data Availability Indication changes.
Wink Saville [Sat, 16 Apr 2011 21:44:08 +0000 (14:44 -0700)]
Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
Wink Saville [Sat, 16 Apr 2011 21:43:30 +0000 (14:43 -0700)]
Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
Wink Saville [Sat, 16 Apr 2011 21:42:49 +0000 (14:42 -0700)]
Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
Mathias Agopian [Sat, 16 Apr 2011 01:15:13 +0000 (18:15 -0700)]
Merge "Fix a GraphicBuffer leak in SurfaceTexture"
Scott Main [Sat, 16 Apr 2011 01:03:14 +0000 (18:03 -0700)]
am
6669f251: docs: fix snippet errors in web doc
* commit '
6669f251391d7e61a6ea55e2538c941f82514dd9':
docs: fix snippet errors in web doc
Wink Saville [Fri, 15 Apr 2011 22:48:48 +0000 (15:48 -0700)]
am
9bd1368b: am
6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
* commit '
9bd1368bb431d701604a48b226ee362fc7838c6a':
Cleanup/add log statements.
Wink Saville [Fri, 15 Apr 2011 22:46:27 +0000 (15:46 -0700)]
am
6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
* commit '
6ed4798c70bf4ba253a8cdd37bf48008af81da7d':
Cleanup/add log statements.
Wink Saville [Fri, 15 Apr 2011 22:44:18 +0000 (15:44 -0700)]
Merge "Cleanup/add log statements." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:41:35 +0000 (15:41 -0700)]
am
93a3f72a: am
cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
* commit '
93a3f72aa0475e08bbe7de8d512f7149428aaf2d':
Change RIL initialization.
Wink Saville [Fri, 15 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am
cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
* commit '
cb0c5f16e9131e73cda38ce18c00a31b1d5be2c3':
Change RIL initialization.
Wink Saville [Fri, 15 Apr 2011 22:36:43 +0000 (15:36 -0700)]
Merge "Change RIL initialization." into honeycomb-LTE
Eric Fischer [Fri, 15 Apr 2011 22:01:11 +0000 (15:01 -0700)]
Merge "Import revised translations."
Dianne Hackborn [Fri, 15 Apr 2011 19:54:15 +0000 (12:54 -0700)]
Merge "More battery stats improvements."
Bjorn Bringert [Fri, 15 Apr 2011 14:28:40 +0000 (07:28 -0700)]
Merge "Improve TTS engine audio buffer API"
Wu-cheng Li [Fri, 15 Apr 2011 11:21:43 +0000 (04:21 -0700)]
Merge "Fix camera javadoc errors."
Steve Block [Fri, 15 Apr 2011 10:17:46 +0000 (03:17 -0700)]
Merge "Adding WebElement.java which provides DOM friendly API function to lookup HTML elements in the page."
Bjorn Bringert [Tue, 8 Mar 2011 16:00:40 +0000 (16:00 +0000)]
Add Java API for writing TTS engines
This removes the old non-public C++ API for TTS
engines and replaces it with a Java API.
The new API is still @hidden, until it has been approved.
Bug:
4148636
Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7
Jim Miller [Fri, 15 Apr 2011 08:07:45 +0000 (01:07 -0700)]
Merge "Use system IME for LockScreen password mode."
Elliott Hughes [Fri, 15 Apr 2011 00:00:52 +0000 (17:00 -0700)]
Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."
Dianne Hackborn [Thu, 14 Apr 2011 22:43:03 +0000 (15:43 -0700)]
am
07a630d2: am
9a03a73a: am
f6f87c98: Merge "Fix issue #
4291805: Tap Fish crashes on launch" into honeycomb-mr1
* commit '
07a630d23ef326f820e6339b5f691df0aafd3574':
Fix issue #
4291805: Tap Fish crashes on launch
Dianne Hackborn [Thu, 14 Apr 2011 22:40:00 +0000 (15:40 -0700)]
am
9a03a73a: am
f6f87c98: Merge "Fix issue #
4291805: Tap Fish crashes on launch" into honeycomb-mr1
* commit '
9a03a73a44c69706fe2b97a28632928f58b434b1':
Fix issue #
4291805: Tap Fish crashes on launch
Dianne Hackborn [Thu, 14 Apr 2011 22:27:32 +0000 (15:27 -0700)]
am
f6f87c98: Merge "Fix issue #
4291805: Tap Fish crashes on launch" into honeycomb-mr1
* commit '
f6f87c985989603139b31df663f9f9a90543cacc':
Fix issue #
4291805: Tap Fish crashes on launch
Dianne Hackborn [Thu, 14 Apr 2011 22:10:31 +0000 (15:10 -0700)]
Merge "Fix issue #
4291805: Tap Fish crashes on launch" into honeycomb-mr1
Eric Fischer [Thu, 14 Apr 2011 22:04:41 +0000 (15:04 -0700)]
am
1bfb2db9: (-s ours) am
b590ca85: am
4e3d6aa0: am
d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
Import revised translations. DO NOT MERGE
Scott Main [Thu, 14 Apr 2011 22:04:17 +0000 (15:04 -0700)]
am
cc0cfcf2: am
a4f4a843: am
2a08e7bf: am
d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
* commit '
cc0cfcf2ece4610126b7b213af2673da45772270':
docs: bring back the SDK EULA wall for downloading archived SDKs
Eric Fischer [Thu, 14 Apr 2011 21:29:19 +0000 (14:29 -0700)]
am
b590ca85: am
4e3d6aa0: am
d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
b590ca85afba6b886cc995e9a6092457174ea016':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:26:46 +0000 (14:26 -0700)]
am
4e3d6aa0: am
d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
4e3d6aa0688f023dfe5feb2eb197207cc8267463':
Import revised translations. DO NOT MERGE
Scott Main [Thu, 14 Apr 2011 21:23:23 +0000 (14:23 -0700)]
am
a4f4a843: am
2a08e7bf: am
d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
* commit '
a4f4a8431caaef4e1381acc41a84e44e99a13e37':
docs: bring back the SDK EULA wall for downloading archived SDKs
Eric Fischer [Thu, 14 Apr 2011 21:21:57 +0000 (14:21 -0700)]
am
d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
d284a8676e002a72b66d321402ec7f4ed61c7915':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:14:46 +0000 (14:14 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb