OSDN Git Service
David Christie [Tue, 27 Oct 2015 20:29:14 +0000 (13:29 -0700)]
Correct range checking for location strings during conversion
Minute values in the range [0, 59] are valid if seconds are
present. If seconds are not present then minute values are
valid in the range [0, <60]
Second values are valid in the range [0, <60]
Examples:
50:59:59.99999 is valid
50:59.99999 is valid
50:59.1:1 is not valid
Patch taken from Motorola: partner gerrit 137210
Bug:
17958582
Change-Id: I0d1265534092157883af564119f723984362d436
Issues: 2667 and 2668
Dianne Hackborn [Tue, 27 Oct 2015 00:15:02 +0000 (00:15 +0000)]
Merge "Bring back the sensing alarm. We need it!"
Chong Zhang [Mon, 26 Oct 2015 23:57:13 +0000 (23:57 +0000)]
Merge "Use saved window surface to start entering animation"
Mitchell Wills [Mon, 26 Oct 2015 23:53:57 +0000 (23:53 +0000)]
Merge "Fix TimeUtils.formatDuration for exactly one of a unit"
Chong Zhang [Fri, 23 Oct 2015 21:01:43 +0000 (14:01 -0700)]
Use saved window surface to start entering animation
When app is paused, keep the window surface around. Use it to start
enter animation if size remains unchanged on next launch.
bug:
19940527
Change-Id: Icf88d81f08b59e8bd946e410611f5098b253eb10
Chris Craik [Mon, 26 Oct 2015 23:12:46 +0000 (23:12 +0000)]
Merge "Initial version of clipped saveLayer in new pipeline"
Chris Craik [Fri, 23 Oct 2015 21:33:42 +0000 (14:33 -0700)]
Initial version of clipped saveLayer in new pipeline
Additionally disables usage of FBO cache, so FBO destruction safely
interacts with renderstate caching.
Change-Id: I25c277cb7afec2ca33bf226445d6c8867a15a915
Filip Gruszczynski [Mon, 26 Oct 2015 00:15:06 +0000 (17:15 -0700)]
Clean up and document app transition animation loading.
We had three different sources of information about where the
animated window will start/end: appFrame, containingFrame,
containingWidth/Height. We can merge these into one, because
containingWidth/Height can be calculated from containingFrame and
appFrame is actually used only once and the containingFrame is not
used in the same scenario.
Also, documentation about the frames and insets. The rest is fairly
simple, but frames and insets need explanation of how they are used.
Finally, simplify naming.
Bug:
25246833
Change-Id: I0accc2f23792bca4e1b9941007c6249745e023ce
Filip Gruszczynski [Mon, 26 Oct 2015 21:48:30 +0000 (21:48 +0000)]
Merge "Improve infrastructure for replacing windows."
John Reck [Mon, 26 Oct 2015 21:32:52 +0000 (21:32 +0000)]
Merge "eglSwapBuffers can also return EGL_BAD_NATIVE_WINDOW"
Dianne Hackborn [Mon, 26 Oct 2015 21:31:07 +0000 (14:31 -0700)]
Bring back the sensing alarm. We need it!
Change-Id: I9f42dc19b99b7550189449d0a5100caa140810c1
Filip Gruszczynski [Sun, 25 Oct 2015 23:05:27 +0000 (16:05 -0700)]
Improve infrastructure for replacing windows.
We need to be more precise when removing the window that is being
replaced. We used to depend on the fact that we can remove it after
the first draw of the new added window. However, due to resizing the
old window might reset its draw state and that will trigger a removal
of that window.
We need to add an information about the window that is replacing the
old one and only when this new window draws itself, we remove the old
one.
This improves the transition after maximizing docked window. This is
a situation where first resize operation finishes and immediately
after we have a replacement operation.
Bug:
24914011
Change-Id: Ia8e5bb7872787e663ba23f26588f9c4db1a5e574
Filip Gruszczynski [Mon, 26 Oct 2015 21:09:27 +0000 (21:09 +0000)]
Merge "Align the freeform to docking animation."
Filip Gruszczynski [Sun, 25 Oct 2015 20:40:47 +0000 (13:40 -0700)]
Align the freeform to docking animation.
It was not aligned, because we didn't take into account that the
docked window will be cropped by the status bar and navigation
bar. We need to account for that when creating the animation.
Bug:
24913915
Change-Id: Idb82eefa14d65fe3bf6b25a9bd94c12dc8cbe648
John Reck [Mon, 26 Oct 2015 20:52:52 +0000 (13:52 -0700)]
eglSwapBuffers can also return EGL_BAD_NATIVE_WINDOW
Bug:
25017107
Change-Id: I545a746ba89d577de5769bc3e7dd335a100638c0
Steve McKay [Mon, 26 Oct 2015 20:51:09 +0000 (20:51 +0000)]
Merge "Address followup comments from 793838."
Steve McKay [Fri, 23 Oct 2015 16:04:09 +0000 (09:04 -0700)]
Address followup comments from 793838.
Change-Id: Ie77112ea38796f970a8f688c1c94aeb05f46ab78
Phil Burk [Mon, 26 Oct 2015 20:26:11 +0000 (20:26 +0000)]
Merge "MIDI docs: add missing bracket"
Xiaohui Chen [Mon, 26 Oct 2015 20:01:51 +0000 (20:01 +0000)]
Merge "Scan package with null user context."
Xiaohui Chen [Mon, 26 Oct 2015 18:36:39 +0000 (11:36 -0700)]
Scan package with null user context.
Bug:
25185277
Change-Id: Ib15c04b55b10e315f186dd58a9489bbfcd527061
Geoff Mendal [Mon, 26 Oct 2015 19:59:46 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
db4f28692a -s ours am:
ad3bd48dfe -s ours
am:
dd21740d6b -s ours
* commit '
dd21740d6b6ec56e812cd2845c85fe3efd3e3e6a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:58:17 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9865051825 -s ours am:
fe4a48c010 -s ours
am:
4604e75970 -s ours
* commit '
4604e7597041f17dce0f9469ab5dcaae32426cf4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:51:18 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
db4f28692a -s ours
am:
ad3bd48dfe -s ours
* commit '
ad3bd48dfe219ac6cb8531f7a7750437c75b0fa3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:49:00 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9865051825 -s ours
am:
fe4a48c010 -s ours
* commit '
fe4a48c01056f539f041572c5b685fa44eddb9f4':
Import translations. DO NOT MERGE
Vladislav Kaznacheev [Mon, 26 Oct 2015 19:46:21 +0000 (19:46 +0000)]
Merge "Fix drag and drop URI permission grants"
Geoff Mendal [Mon, 26 Oct 2015 19:42:59 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
db4f28692a -s ours
* commit '
db4f28692aacccb57d64f86b3dfd4205bafebf9b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:40:56 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
9865051825 -s ours
* commit '
9865051825fbc709510deefa129c4210fadf057a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:35:20 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:02 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Wale Ogunwale [Mon, 26 Oct 2015 19:27:57 +0000 (19:27 +0000)]
Merge changes I8ac518ce,I8392b4c3,I3bef3f75
* changes:
Support for activity to opt-in/out of PiP form of multi-window.
API for moving top activity in a stack to pinned stack.
Added support for pinned stack.
Wale Ogunwale [Mon, 26 Oct 2015 19:27:32 +0000 (19:27 +0000)]
Merge "Removed use of leanback mode in ActivityManager."
Geoff Mendal [Mon, 26 Oct 2015 19:25:11 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8961b24ff2 -s ours am:
7976a3fbf4 -s ours
am:
cc7abc5edd -s ours
* commit '
cc7abc5eddf9c2a47456103a720d28609e94b658':
Import translations. DO NOT MERGE
Wale Ogunwale [Sat, 24 Oct 2015 19:35:56 +0000 (12:35 -0700)]
Support for activity to opt-in/out of PiP form of multi-window.
While it makes sense to be able to resize most activities types
in multi-window mode. It only makes sense to put specific types
of activities in Picture-in-Picture (PiP) form of multi-window.
For example, activities that play video will be good candidates
while the Settings activity isn't.
The new flag allows the system to differentiate between resizeable
activities that can go into PiP mode and those that can't.
Bug:
25006507
Change-Id: I8ac518cec2fa3c8fb88be40c266b3751fb88f1ce
Geoff Mendal [Mon, 26 Oct 2015 19:23:46 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
4917e9dd1c -s ours am:
e8be87e96f -s ours
am:
b45b5ee1ca -s ours
* commit '
b45b5ee1ca8c014f41e2aba6186285f573437aae':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:22:19 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
82b5276866 -s ours am:
76941becab -s ours
am:
5f4f059440 -s ours
* commit '
5f4f059440f1d438280a829c6f1db42a2f432372':
Import translations. DO NOT MERGE
Winson Chung [Mon, 26 Oct 2015 19:20:30 +0000 (19:20 +0000)]
Merge "Adding flag for disabling search bar."
Winson [Mon, 26 Oct 2015 17:56:59 +0000 (10:56 -0700)]
Adding flag for disabling search bar.
Change-Id: I988912c8209f1e49c71e4db2a7b926c808dbc975
Geoff Mendal [Mon, 26 Oct 2015 19:16:11 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8961b24ff2 -s ours
am:
7976a3fbf4 -s ours
* commit '
7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:14:46 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
4917e9dd1c -s ours
am:
e8be87e96f -s ours
* commit '
e8be87e96f7c9e854e7ac57475f38fedb8e1cac8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:13:04 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
82b5276866 -s ours
am:
76941becab -s ours
* commit '
76941becab388c347577dfc60d6fae4b190b684a':
Import translations. DO NOT MERGE
Ben Kwa [Mon, 26 Oct 2015 19:12:50 +0000 (19:12 +0000)]
Merge "Fix a DocsUI crash due to a misnamed xml reference."
Steve McKay [Mon, 26 Oct 2015 19:11:18 +0000 (19:11 +0000)]
Merge "Add functional tests for FilesActivity."
Steve McKay [Fri, 23 Oct 2015 18:46:01 +0000 (11:46 -0700)]
Add functional tests for FilesActivity.
Adds a bare bones test provider with dummy data.
This is basically just the bones of a test at this point.
Has just one simple test...switch list/grid modes.
Will add more tests (like manipulating the dummy data) in future CLs.
Bug:
24988170
Change-Id: Icc25718a416bc804874835c74a6d7862a52c9861
Geoff Mendal [Mon, 26 Oct 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8961b24ff2 -s ours
* commit '
8961b24ff2541fc246e275ae3cc4cdda64934462':
Import translations. DO NOT MERGE
Wale Ogunwale [Sat, 24 Oct 2015 18:44:07 +0000 (11:44 -0700)]
API for moving top activity in a stack to pinned stack.
* AMS.moveTopStackActivityToPinnedStack can be used to move the top
activity in a stack to the pinned stack and also specify the bounds
the pinned stack should be sized to.
* 'am stack move-top-activity-to-pinned-stack' command for testing
AMS.moveTopStackActivityToPinnedStack API
Bug:
25006507
Change-Id: I8392b4c39d8542153e691be7a627b7f35fd44884
Geoff Mendal [Mon, 26 Oct 2015 19:06:53 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
4917e9dd1c -s ours
* commit '
4917e9dd1c727a003e9636e4c78c3f5c1aad7402':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:04:39 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
82b5276866 -s ours
* commit '
82b52768667a16a6ef02b2d9aa9cd171f547331a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:04:18 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 19:02:09 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:59:41 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:25 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:13 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Ben Kwa [Mon, 26 Oct 2015 18:54:41 +0000 (11:54 -0700)]
Fix a DocsUI crash due to a misnamed xml reference.
BUG=
25266394
Change-Id: I06bd3283e52467af3ebb43396d4166b3c25620a9
Geoff Mendal [Mon, 26 Oct 2015 18:49:23 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a0b74d374b31531c37be9b0d8bc251300a82009
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:43:00 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia70d07e17335f2a77a0c66ff9fb906e6f6f70171
Auto-generated-cl: translation import
Phil Burk [Mon, 26 Oct 2015 18:41:11 +0000 (11:41 -0700)]
MIDI docs: add missing bracket
The example code for openDevice() was missing a close bracket.
Bug:
25283941
Change-Id: I8fac6a6dee2393125ad4e057cb857fe21e43b491
Signed-off-by: Phil Burk <philburk@google.com>
Geoff Mendal [Mon, 26 Oct 2015 18:40:53 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19a669e57b0264602c1daa8703caa8ac506a6cd7
Auto-generated-cl: translation import
Tony Mantler [Mon, 26 Oct 2015 18:39:15 +0000 (18:39 +0000)]
Merge "Move some app methods to AppUtils in SettingsLib"
Wale Ogunwale [Sat, 24 Oct 2015 03:08:22 +0000 (20:08 -0700)]
Added support for pinned stack.
Used to support picture-in-picture use case for multi-window
Bug:
25006507
Change-Id: I3bef3f75e0c003f5974274294f1250171d424625
Bryce Lee [Mon, 26 Oct 2015 17:39:15 +0000 (17:39 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev am:
521ac43fe5 am:
4c42942d53
am:
1fd4da3b4f
* commit '
1fd4da3b4f502adbe55e8340c3ec433f08ac89bd':
Add Telecom config bool to require a phone account to be present for handle
Bryce Lee [Mon, 26 Oct 2015 17:30:07 +0000 (17:30 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev am:
521ac43fe5
am:
4c42942d53
* commit '
4c42942d539ee1ad3511b37d5f1d6e17da684103':
Add Telecom config bool to require a phone account to be present for handle
Geoff Mendal [Mon, 26 Oct 2015 17:23:06 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
609444dff3 -s ours am:
65b9942a6c -s ours
am:
31999bbbd0 -s ours
* commit '
31999bbbd0af2165748c78be2c2786495b404f06':
Import translations. DO NOT MERGE
Bryce Lee [Mon, 26 Oct 2015 17:18:14 +0000 (17:18 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev
am:
521ac43fe5
* commit '
521ac43fe581ee55fb8acf98bf52af622e03e9b1':
Add Telecom config bool to require a phone account to be present for handle
Filip Gruszczynski [Mon, 26 Oct 2015 17:13:28 +0000 (17:13 +0000)]
Merge "Fix recents <-> full screen animations in landscape."
Geoff Mendal [Mon, 26 Oct 2015 17:11:32 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
609444dff3 -s ours
am:
65b9942a6c -s ours
* commit '
65b9942a6c381eda6433c1a679c6070144565d8a':
Import translations. DO NOT MERGE
Bryce Lee [Mon, 26 Oct 2015 17:08:49 +0000 (17:08 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev
John Reck [Mon, 26 Oct 2015 17:06:49 +0000 (17:06 +0000)]
Merge "cleanup"
Geoff Mendal [Mon, 26 Oct 2015 17:02:23 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
609444dff3 -s ours
* commit '
609444dff3df707589fb2b26e86338618618b871':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 17:01:01 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
14bb0511c6 -s ours am:
6995e0bf08 -s ours am:
eeb2376185 -s ours
am:
b5e060ad63 -s ours
* commit '
b5e060ad63aec34e95b67f7632a2914b31fd2ca6':
Import translations. DO NOT MERGE
Julia Reynolds [Mon, 26 Oct 2015 16:59:25 +0000 (16:59 +0000)]
Merge "SystemUI: Reload the EndNowButton label" am:
40b52bbe48 am:
c7839bde7c
am:
537af1070b
* commit '
537af1070b71919a76489881d3740bd55e1fb45a':
SystemUI: Reload the EndNowButton label
Geoff Mendal [Mon, 26 Oct 2015 16:57:40 +0000 (16:57 +0000)]
Import translations. DO NOT MERGE am:
f6fc9e2152 -s ours am:
432eb8e686 -s ours am:
8b41305696 -s ours
am:
5a33a869e3 -s ours
* commit '
5a33a869e39b09d0b71835be65d39f7b1f80f458':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:57:30 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
John Reck [Mon, 26 Oct 2015 16:55:00 +0000 (09:55 -0700)]
cleanup
Change-Id: I3b64e0af45f778c7d030c3c1a38c2103f91a4223
Geoff Mendal [Mon, 26 Oct 2015 16:53:50 +0000 (11:53 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3b8c2defeead0f1a68f261eaa271e7a316130627
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 16:50:36 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
14bb0511c6 -s ours am:
6995e0bf08 -s ours
am:
eeb2376185 -s ours
* commit '
eeb237618544f1fda2fffacc85a6edb8e5405cb8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:43:51 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
14bb0511c6 -s ours
am:
6995e0bf08 -s ours
* commit '
6995e0bf0815ec9b0eab8b3630d28f289475057c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:33:36 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
14bb0511c6 -s ours
* commit '
14bb0511c6cc5ad62a870b3c2437c8090bcf75af':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:28:12 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 26 Oct 2015 16:27:21 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 26 Oct 2015 16:27:14 +0000 (11:27 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 16:14:49 +0000 (11:14 -0500)]
Import translations. DO NOT MERGE
Change-Id: If16d9ce42e80f3b4961d7d7e878870718ad0806b
Auto-generated-cl: translation import
Paul Jensen [Mon, 26 Oct 2015 15:15:33 +0000 (15:15 +0000)]
Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN"
Julia Reynolds [Mon, 26 Oct 2015 15:15:24 +0000 (15:15 +0000)]
Merge "SystemUI: Reload the EndNowButton label" am:
40b52bbe48
am:
c7839bde7c
* commit '
c7839bde7cd8ed21326208b17030c87e8bf206c9':
SystemUI: Reload the EndNowButton label
Julia Reynolds [Mon, 26 Oct 2015 15:05:34 +0000 (15:05 +0000)]
Merge "SystemUI: Reload the EndNowButton label"
am:
40b52bbe48
* commit '
40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
SystemUI: Reload the EndNowButton label
Julia Reynolds [Mon, 26 Oct 2015 14:57:34 +0000 (14:57 +0000)]
Merge "SystemUI: Reload the EndNowButton label"
Johan Redestig [Fri, 23 Oct 2015 16:23:40 +0000 (18:23 +0200)]
SystemUI: Reload the EndNowButton label
Reload the EndNowButton label when configuration
changes.
Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
Geoff Mendal [Mon, 26 Oct 2015 14:50:48 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am:
f6fc9e2152 -s ours am:
432eb8e686 -s ours
am:
8b41305696 -s ours
* commit '
8b41305696055296016e57c82520eeac9c2a57d4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:42:15 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am:
f6fc9e2152 -s ours
am:
432eb8e686 -s ours
* commit '
432eb8e686ce1f4f993b74be73ec035341fa4599':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:31:12 +0000 (14:31 +0000)]
Import translations. DO NOT MERGE
am:
f6fc9e2152 -s ours
* commit '
f6fc9e215292945ef3add558e513e5eef01acbfe':
Import translations. DO NOT MERGE
Derek Sollenberger [Mon, 26 Oct 2015 14:22:37 +0000 (10:22 -0400)]
Add missing include for SkPath
Change-Id: Ib1577714d0e5c7e7c7d0e6593debe30e78f0df59
Geoff Mendal [Mon, 26 Oct 2015 14:17:06 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 13:09:24 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 26 Oct 2015 13:08:45 +0000 (06:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibfc65ba41159a6f46117aa5015533bdced91cd56
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 12:57:14 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 26 Oct 2015 12:56:23 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcb5330948acdc172f2af763f32e6d8235d64a30
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 12:51:25 +0000 (12:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 26 Oct 2015 12:50:22 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8635097aee86e5c12b142769ec91d8788d800c22
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 12:50:05 +0000 (12:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 26 Oct 2015 12:42:22 +0000 (05:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fe6c2348c55959ac4adb4e93eda481b6886a697
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 12:41:06 +0000 (12:41 +0000)]
Import translations. DO NOT MERGE am:
a1ecb9ee2b -s ours am:
a0b24e64d0 -s ours
am:
36dc6cc522 -s ours
* commit '
36dc6cc52202fb7cb85acdd3572cf1a5fb085f51':
Import translations. DO NOT MERGE
OSDN Git Service
