OSDN Git Service
Matthew Williams [Fri, 11 Apr 2014 22:49:16 +0000 (15:49 -0700)]
TaskManager API first pass.
This is a very barebones first pass, meant to ensure we're all on the
same page, and also get feedback.
Change-Id: I7d5492dc5aafbe583f7c2d97ebf1444b6d2e068a
Fabrice Di Meglio [Wed, 9 Apr 2014 20:29:19 +0000 (20:29 +0000)]
Merge "Update SearchIndexablesContract"
Fabrice Di Meglio [Wed, 9 Apr 2014 20:17:42 +0000 (13:17 -0700)]
Update SearchIndexablesContract
- add indices constants for colums
- add missing properties (entries / key)
Change-Id: Ie6c00abf27aaf0fc27e685c8ee0ff8e1e16b5d52
Alan Viverette [Wed, 9 Apr 2014 20:08:46 +0000 (20:08 +0000)]
Merge "Update supported Drawable tinting modes and docs"
Alan Viverette [Wed, 9 Apr 2014 19:45:18 +0000 (12:45 -0700)]
Update supported Drawable tinting modes and docs
Change-Id: I9c20d2bc4dc499f91c21a348871cf209c1065ba6
Jae Seo [Wed, 9 Apr 2014 19:08:17 +0000 (12:08 -0700)]
Skip cleaning up TV service/session when the user state is not found
Bug:
13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
Zhijun He [Wed, 9 Apr 2014 05:43:51 +0000 (22:43 -0700)]
Camera2: Fix the JPEG format issues
Also add unit test.
Bug:
13836016
Change-Id: I0af4bfe299f99c99e70faf5d3159eb0cbcc147eb
Chris Craik [Wed, 9 Apr 2014 18:10:28 +0000 (18:10 +0000)]
Merge "When recording a child node into a parent, read staging projection property"
John Reck [Wed, 9 Apr 2014 18:10:27 +0000 (18:10 +0000)]
Merge "Fix ThreadedRenderer.setEnabled()"
John Reck [Wed, 9 Apr 2014 17:01:03 +0000 (10:01 -0700)]
Fix ThreadedRenderer.setEnabled()
Bug:
13914116
Fixes lifecycle issues around setEnabled where ThreadedRenderer
was reporting as being enabled before it had a Surface. This is
incorrect.
Also fix some EGL lifecycle issues
Change-Id: I12ebb279707f9b533a570b61d68735d858b560bf
Winson Chung [Wed, 9 Apr 2014 17:39:31 +0000 (17:39 +0000)]
Merge "Prevent Recents from lingering after screen-off."
Jean-Michel Trivi [Wed, 9 Apr 2014 16:51:52 +0000 (16:51 +0000)]
Merge "Audio focus doesn't affect RemoteController"
Mark Salyzyn [Wed, 9 Apr 2014 16:19:47 +0000 (16:19 +0000)]
am
280fe930: am
7a67c927: am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
280fe930a432d9e2ead8c4b58ce76a0ee45742e7':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:14:41 +0000 (16:14 +0000)]
am
7a67c927: am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
7a67c927e622bb176b21455b8ed56c76b8e0f602':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:11:04 +0000 (16:11 +0000)]
am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
ecdf9b199ac9659c37c34c0b23084199acea80bf':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "jni: liblog reading error API incorrect"
Narayan Kamath [Wed, 9 Apr 2014 14:24:56 +0000 (14:24 +0000)]
am
769a2475: am
b6ab8c17: am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
769a247595cb78536fa159e8f5d54191a4ef90c6':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:19:46 +0000 (14:19 +0000)]
am
b6ab8c17: am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:15:16 +0000 (14:15 +0000)]
am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
a6f5e79dd182b05909fa53109e74638afcd7ee12':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:12:22 +0000 (14:12 +0000)]
Merge "Allow connections to multiple zygotes."
Narayan Kamath [Thu, 3 Apr 2014 19:15:15 +0000 (20:15 +0100)]
Allow connections to multiple zygotes.
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.
Both zygotes are assumed to be active at all points.
Change-Id: I460319b4481ff1c1666e8172223691820658a35c
Narayan Kamath [Wed, 9 Apr 2014 14:06:14 +0000 (14:06 +0000)]
am
9f777008: am
05f980d4: am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
9f777008eaead3cb9cee80d0c00e5a3d55de9de7':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 14:06:10 +0000 (14:06 +0000)]
am
97175deb: am
3856a219: am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
97175deb446cdaca7f3910b71940cb443bda3cc4':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 14:02:18 +0000 (14:02 +0000)]
am
05f980d4: am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
05f980d42d4926ab2130cdcf9e646eb610a7080b':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 14:02:08 +0000 (14:02 +0000)]
am
3856a219: am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:59:00 +0000 (13:59 +0000)]
am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
d4b644092e8d2719d01ad297b080bd50b1fdf60d':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
cecfb94f3f1b2978ba66342d7920e83770c808e3':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:57:59 +0000 (14:57 +0100)]
resolved conflicts for merge of
7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
Narayan Kamath [Wed, 9 Apr 2014 13:55:55 +0000 (13:55 +0000)]
Merge "Make zygotes aware of their supported ABIs."
Narayan Kamath [Wed, 9 Apr 2014 13:55:54 +0000 (13:55 +0000)]
Merge "Clean up argc / argv processing for runtime args."
Narayan Kamath [Mon, 7 Apr 2014 12:56:15 +0000 (13:56 +0100)]
Make zygotes aware of their supported ABIs.
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
Narayan Kamath [Mon, 7 Apr 2014 11:44:58 +0000 (12:44 +0100)]
Clean up argc / argv processing for runtime args.
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
Narayan Kamath [Wed, 9 Apr 2014 12:20:01 +0000 (12:20 +0000)]
am
dc7eb9c9: am
00cfbe82: am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
dc7eb9c947f36cbd34021663845bcbb090c3169d':
Don't allow MemoryFiles of negative length.
Kenny Guy [Wed, 9 Apr 2014 11:42:39 +0000 (11:42 +0000)]
Merge "Finish rename of related users to profiles."
Narayan Kamath [Wed, 9 Apr 2014 11:33:20 +0000 (11:33 +0000)]
am
00cfbe82: am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
Don't allow MemoryFiles of negative length.
Yohann Roussel [Wed, 9 Apr 2014 09:49:57 +0000 (09:49 +0000)]
Merge "A stress test for concurent multidex extraction."
Jeff Brown [Wed, 9 Apr 2014 09:17:10 +0000 (09:17 +0000)]
am
7f9599d6: (-s ours) am
ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '
7f9599d63c892934c7f8a2e46d1e518ddb0d43df':
Move display power controller to display manager service. (DO NOT MERGE)
Sander Alewijnse [Wed, 9 Apr 2014 09:14:50 +0000 (09:14 +0000)]
Merge "Changed tag name and error strings for PersistentPreferredActivity storage."
Jeff Brown [Wed, 9 Apr 2014 09:12:40 +0000 (09:12 +0000)]
am
ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '
ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
Narayan Kamath [Wed, 9 Apr 2014 09:09:58 +0000 (09:09 +0000)]
am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
Don't allow MemoryFiles of negative length.
Narayan Kamath [Wed, 9 Apr 2014 09:07:29 +0000 (09:07 +0000)]
Merge "Don't allow MemoryFiles of negative length."
Jeff Brown [Wed, 9 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Move certain internal activity manager methods to new class." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 04:36:22 +0000 (04:36 +0000)]
Merge "Move display power controller to display manager service."
Jeff Brown [Wed, 9 Apr 2014 00:27:14 +0000 (17:27 -0700)]
Move display power controller to display manager service.
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
Jeff Brown [Wed, 9 Apr 2014 04:33:27 +0000 (04:33 +0000)]
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Tue, 8 Apr 2014 02:45:27 +0000 (19:45 -0700)]
Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.
Deleted the startRunning method since it is no longer useful.
Bug:
13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
Jeff Brown [Wed, 9 Apr 2014 00:26:30 +0000 (17:26 -0700)]
Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
Tor Norbye [Wed, 9 Apr 2014 01:37:43 +0000 (01:37 +0000)]
Merge "Add resource reference annotations"
Chris Craik [Wed, 9 Apr 2014 01:17:07 +0000 (18:17 -0700)]
When recording a child node into a parent, read staging projection property
bug:
13770920
The other properties should not be read from the UI thread.
Change-Id: I61d13774553d46a8963623727d8e8eeeb3385cc9
Zhijun He [Wed, 9 Apr 2014 00:41:46 +0000 (17:41 -0700)]
Camera2: Make colorFilterArrangement public
It will be used by DNG
Also fix a typo in spec.
Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
Amith Yamasani [Wed, 9 Apr 2014 00:26:17 +0000 (00:26 +0000)]
Merge "Avoid security exception when requesting badging"
Amith Yamasani [Wed, 9 Apr 2014 00:23:46 +0000 (17:23 -0700)]
Avoid security exception when requesting badging
When requesting badged icons, use APIs that don't require the caller
to have MANAGE_USERS permission.
Change-Id: I218cdf5194f38f4affa1874a6fcb43a040ed5295
Alan Viverette [Wed, 9 Apr 2014 00:16:55 +0000 (00:16 +0000)]
Merge "Theming for more VectorDrawable attrs, add attrs to test app"
Christopher Tate [Wed, 9 Apr 2014 00:14:43 +0000 (00:14 +0000)]
Merge "Don't crash on null installer package bookkeeping."
Alan Viverette [Wed, 9 Apr 2014 00:12:43 +0000 (17:12 -0700)]
Theming for more VectorDrawable attrs, add attrs to test app
BUG:
13878079
Change-Id: Ibcc8d67446c44cd8f681230fc484c7dc7411ffab
Christopher Tate [Tue, 8 Apr 2014 23:34:06 +0000 (16:34 -0700)]
Don't crash on null installer package bookkeeping.
Bug
13906859
Change-Id: I926ccc5620abae8b97bd2b7de21b82b7729e78dd
Zhijun He [Wed, 9 Apr 2014 00:10:00 +0000 (00:10 +0000)]
Merge "ImageReader: Fix raw buffer size calculation issue"
Zhijun He [Tue, 8 Apr 2014 23:59:29 +0000 (16:59 -0700)]
ImageReader: Fix raw buffer size calculation issue
Stride should be used to calculate the size rather than width.
Change-Id: I01051fdf4dd2978d56b9998d8bcd542c50458f56
Alan Viverette [Tue, 8 Apr 2014 23:38:22 +0000 (23:38 +0000)]
Merge "Make Drawable hotspot APIs public"
Deepanshu Gupta [Tue, 8 Apr 2014 23:37:33 +0000 (23:37 +0000)]
Merge "Update layoutlib create README"
Alan Viverette [Tue, 8 Apr 2014 23:37:19 +0000 (16:37 -0700)]
Make Drawable hotspot APIs public
Change-Id: I8377ed735f73f7083636947aa08a5427f1dc3bf6
Jean-Michel Trivi [Tue, 8 Apr 2014 22:13:57 +0000 (15:13 -0700)]
Audio focus doesn't affect RemoteController
The top of the stack of PlayerRecord instances is the "promoted"
instance whose RemoteControlClient information is available
to RemoteController objects, only when it also has audio focus.
This change removes the condition on audio focus ownership:
- whenever the player record stack ordering changes, no need to
check if it also has audio focus
- since the player record and audio focus stacks operate separately,
there is no need to synchronize access to both stacks.
Change-Id: I668f2aa2950f19f8c2a30bc59c7352246edcc56e
Deepanshu Gupta [Tue, 8 Apr 2014 23:16:43 +0000 (16:16 -0700)]
Update layoutlib create README
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.
Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Jae Seo [Tue, 8 Apr 2014 23:00:51 +0000 (23:00 +0000)]
Merge "Unhide TvInputSession"
Deepanshu Gupta [Tue, 8 Apr 2014 22:47:44 +0000 (22:47 +0000)]
Merge "Make layoutlib load on Java 7 VM"
Jae Seo [Tue, 8 Apr 2014 22:40:17 +0000 (15:40 -0700)]
Unhide TvInputSession
This is necessary for the SDK build.
Change-Id: I64fb6b7e6cc3147edbfff0c34cd6af7f45a82364
Alan Viverette [Tue, 8 Apr 2014 22:29:37 +0000 (22:29 +0000)]
Merge "Make toggle slider use default assets"
Alan Viverette [Tue, 8 Apr 2014 22:27:24 +0000 (15:27 -0700)]
Make toggle slider use default assets
BUG:
13817697
Change-Id: Ibae671a35b55a195b40d8c943f45685fb7b3ac4f
John Reck [Tue, 8 Apr 2014 22:23:13 +0000 (22:23 +0000)]
Merge "Ensure there's a GL context before creating a Layer"
Christoph Studer [Tue, 8 Apr 2014 21:43:07 +0000 (17:43 -0400)]
Fix memory leak in NotificationStackScrollLayout
Bug:
13899792
Change-Id: I87d6c5e1f0f5052d45203df51284d828823dfd88
John Reck [Tue, 8 Apr 2014 22:18:56 +0000 (15:18 -0700)]
Ensure there's a GL context before creating a Layer
Bug:
13745587
Change-Id: Ib0ec059d9a5974a48734daeec9d83580cada94a3
Alan Viverette [Tue, 8 Apr 2014 22:10:53 +0000 (22:10 +0000)]
Merge "Fix action bar theming"
Deepanshu Gupta [Tue, 8 Apr 2014 22:07:49 +0000 (15:07 -0700)]
Make layoutlib load on Java 7 VM
Prevent Java 7 VM from verifying the StackMapTable for methods by lying
about the class version.
The changeset also fixes the eclipse project by using the right asm
library in the checkout.
Change-Id: Idabf165380fb75fcc2d5c8fbd72388f52887a5df
Amith Yamasani [Tue, 8 Apr 2014 22:04:20 +0000 (22:04 +0000)]
Merge "Launcher APIs and broadcasts for managed profiles"
Alan Viverette [Tue, 8 Apr 2014 21:52:01 +0000 (14:52 -0700)]
Fix action bar theming
Change-Id: If1a7040e4f6d2e8e1195a67a03ed0e24f31e68f4
John Reck [Tue, 8 Apr 2014 21:22:42 +0000 (21:22 +0000)]
Merge "Don't make HardwareRenderer calls in the finalizer"
John Reck [Tue, 8 Apr 2014 21:10:17 +0000 (14:10 -0700)]
Don't make HardwareRenderer calls in the finalizer
Bug:
13902530
Don't try to set the RenderNode's displayListData to 0 in the finalizer.
The HardwareRenderer may have already been finalized and it's not valid
to make calls into HardwareRenderer from another thread anyway.
The fix is that now that RenderNode is a refcounted object, this step
can be skipped entirely. The RenderNode destructor handles deleting
its DisplayListData if it needs to.
Change-Id: Ieab75575b98c24678a531dd5aa41a2d0afde0eef
Alan Viverette [Tue, 8 Apr 2014 20:49:39 +0000 (20:49 +0000)]
Merge "Fix some vector drawable documentation, clean up fields"
Alan Viverette [Tue, 8 Apr 2014 20:35:49 +0000 (13:35 -0700)]
Fix some vector drawable documentation, clean up fields
Change-Id: Iade0323b0ec2d3f8b609f24d89252608dfe40735
Jae Seo [Fri, 21 Feb 2014 02:23:25 +0000 (18:23 -0800)]
Initial round of Television Input Framework
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.
Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
Fabrice Di Meglio [Tue, 8 Apr 2014 02:12:41 +0000 (19:12 -0700)]
Add support for saving and using the Preference's key value
- make public and hide the PreferenceGroupAdapter class
- add setActivated(int position) to be able to set the activated item
- udpate getView(int position, View convertView, ViewGroup parent) to set/unset
the activated item
Change-Id: I8a653ad6541bb6b7a043ba7c3d95e5ecad924a0d
Fabrice Di Meglio [Tue, 8 Apr 2014 20:11:27 +0000 (20:11 +0000)]
Merge "Add support for key value for SearchIndexableData"
Ying Wang [Tue, 8 Apr 2014 19:16:46 +0000 (19:16 +0000)]
Merge "Fix sdk build."
Ying Wang [Tue, 8 Apr 2014 19:14:50 +0000 (12:14 -0700)]
Fix sdk build.
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
Kenny Guy [Tue, 8 Apr 2014 17:59:27 +0000 (17:59 +0000)]
Merge "Pipe notifications from related users to listeners."
Amith Yamasani [Wed, 19 Feb 2014 22:31:52 +0000 (14:31 -0800)]
Launcher APIs and broadcasts for managed profiles
UserManager
- Corp badging
- Querying list of managed profiles
Launcher API
- LauncherApps and Service to proxy changes in managed profile
to the launcher in the primary profile
- Querying and launching launchable apps across profiles
Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
Ying Wang [Fri, 4 Apr 2014 04:42:46 +0000 (21:42 -0700)]
Expose APIs used to be hidden due to Doclava bug.
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.
Bug:
13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
Kenny Guy [Mon, 3 Mar 2014 18:24:03 +0000 (18:24 +0000)]
Pipe notifications from related users to listeners.
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.
Fix bug that notifications from related users didn't
trigger sounds.
Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
Adam Hampson [Tue, 8 Apr 2014 17:38:35 +0000 (17:38 +0000)]
am
668b1bf8: resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
* commit '
668b1bf80b0e34e7079f826cd9e7358835a1e9cd':
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
Adam Hampson [Tue, 8 Apr 2014 17:24:47 +0000 (10:24 -0700)]
resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Narayan Kamath [Tue, 8 Apr 2014 15:10:52 +0000 (16:10 +0100)]
Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
Leon Scroggins III [Tue, 8 Apr 2014 14:39:49 +0000 (14:39 +0000)]
Merge "Remove SkFloatToScalar."
Yohei Yukawa [Tue, 8 Apr 2014 05:48:45 +0000 (05:48 +0000)]
Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
John Reck [Tue, 8 Apr 2014 02:50:22 +0000 (02:50 +0000)]
Merge "Enable RT, round 2"
John Reck [Tue, 8 Apr 2014 02:38:59 +0000 (19:38 -0700)]
Enable RT, round 2
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
Baligh Uddin [Tue, 8 Apr 2014 02:24:11 +0000 (02:24 +0000)]
am
56868fbc: (-s ours) am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
56868fbcd9b086219c4350ac34b5dfdde127c5b9':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:37 +0000 (02:20 +0000)]
am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:16:43 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE"