OSDN Git Service
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Terry Heo [Thu, 5 Nov 2015 06:53:33 +0000 (15:53 +0900)]
CEC: Check validity of tvinput id
Bug:
25006096
Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
Tomasz Mikolajewski [Wed, 4 Nov 2015 09:24:09 +0000 (18:24 +0900)]
Implement efficient move on Internal Storage.
Bug:
24884813
Change-Id: I5a8dfeb13313a3e60ba2993643eb547adca7b851
Tomasz Mikolajewski [Thu, 5 Nov 2015 04:02:36 +0000 (04:02 +0000)]
Merge "Remove TRANSFER_MODE_NONE from CopyManager."
Chong Zhang [Thu, 5 Nov 2015 03:55:51 +0000 (03:55 +0000)]
Merge "fix missing dim layer surface"
Chong Zhang [Thu, 5 Nov 2015 02:36:00 +0000 (18:36 -0800)]
fix missing dim layer surface
bug:
24913379
Change-Id: Id3280ba9cccea57ca9cf0274cea589cd58e71a56
Tomasz Mikolajewski [Wed, 4 Nov 2015 06:33:20 +0000 (15:33 +0900)]
Remove TRANSFER_MODE_NONE from CopyManager.
This field is not necessary, as an operation is always either copy or move.
Change-Id: Ide68bb2bf5d237ed4c9abe8c443edd8e12dd82dd
Tomasz Mikolajewski [Thu, 5 Nov 2015 02:25:23 +0000 (02:25 +0000)]
Merge "Wire copyDocument and moveDocument to CopyService."
Tomasz Mikolajewski [Wed, 4 Nov 2015 02:20:58 +0000 (11:20 +0900)]
Wire copyDocument and moveDocument to CopyService.
Bug:
24884665
Change-Id: Iaeac9ffa468150853f0f36c439f98df53937e519
Felipe Leme [Thu, 5 Nov 2015 02:19:06 +0000 (02:19 +0000)]
Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG:
25455734"
Chris Tate [Thu, 5 Nov 2015 02:02:49 +0000 (02:02 +0000)]
Merge "Make WorkSource version of alarm listener API @SystemApi"
Winson Chung [Thu, 5 Nov 2015 01:59:57 +0000 (01:59 +0000)]
Merge "Adding dnd to/from freeform workspaces."
Winson [Wed, 4 Nov 2015 18:50:28 +0000 (10:50 -0800)]
Adding dnd to/from freeform workspaces.
Change-Id: I5b75fe5a942e9a2e344e62229e860b5108f9872e
Winson [Thu, 5 Nov 2015 01:39:55 +0000 (17:39 -0800)]
Fixing regression in alt-tab task.
Change-Id: Iee73baded04616ee92046609c37257d1551520fb
Chris Tate [Thu, 5 Nov 2015 01:49:24 +0000 (01:49 +0000)]
Merge "Docs: be explicit about oldState contract for backup helpers"
John Reck [Thu, 5 Nov 2015 01:39:37 +0000 (01:39 +0000)]
Merge "Revert "add DeviceInfo""
Chong Zhang [Thu, 5 Nov 2015 01:38:32 +0000 (01:38 +0000)]
Merge "Discard input events sent to dead window"
John Reck [Thu, 5 Nov 2015 01:38:25 +0000 (01:38 +0000)]
Revert "add DeviceInfo"
This reverts commit
b2442896e3a226c7ebe9d47fa80b257e98a6a34d.
Change-Id: I50f6555451f71067505245333c8e558b5e3b2b3b
Christopher Tate [Thu, 5 Nov 2015 01:35:17 +0000 (17:35 -0800)]
Docs: be explicit about oldState contract for backup helpers
Call out specifically that each helper must only consume the
prior-state data that it produced in the first place, not reading
beyond its own part of the state file.
Bug
25473872
Change-Id: I1f24a5738a799eb21d966510372a0f3852436166
Ben Kwa [Thu, 5 Nov 2015 01:01:15 +0000 (01:01 +0000)]
Merge "Move DirectoryFragment and family to dirlist pkg."
Chong Zhang [Thu, 5 Nov 2015 00:23:10 +0000 (16:23 -0800)]
Discard input events sent to dead window
And add a check to skip repositioning if window doesn't have a
valid input channel.
bug:
25345787
Change-Id: I555eb9a2ce258d77cd69c53c323dc3db646c773f
Tomasz Mikolajewski [Wed, 4 Nov 2015 23:17:14 +0000 (23:17 +0000)]
Merge "Add support for opening files in specified MIME type to DocumentsProvider."
Steve McKay [Tue, 3 Nov 2015 23:23:16 +0000 (15:23 -0800)]
Move DirectoryFragment and family to dirlist pkg.
Stuff was getting out of control in the main package.
Change-Id: Ia06ba96f5bbe13388d51e6ad52a9dac76af97cc0
John Reck [Wed, 4 Nov 2015 21:50:36 +0000 (21:50 +0000)]
Merge "add DeviceInfo"
John Reck [Wed, 4 Nov 2015 15:39:35 +0000 (07:39 -0800)]
add DeviceInfo
Change-Id: I4c122278a7e88b6f47c4dd3c5fc553df7d3c900d
Chris Tate [Wed, 4 Nov 2015 21:42:55 +0000 (21:42 +0000)]
Merge "Fix BlobBackupHelper state tracking"
Jason Monk [Wed, 4 Nov 2015 21:10:21 +0000 (21:10 +0000)]
Merge "Settings Drawer: Handle multi-profile/user correctly"
Riley Andrews [Wed, 4 Nov 2015 20:43:38 +0000 (20:43 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d am:
2c740f1dcf am:
6c1144dc0f
am:
132bb1e4b1
* commit '
132bb1e4b10755d2bc0810135511fd999badbe4b':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:37:18 +0000 (20:37 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d am:
2c740f1dcf
am:
6c1144dc0f
* commit '
6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:30:48 +0000 (20:30 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d
am:
2c740f1dcf
* commit '
2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:24:36 +0000 (20:24 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am:
c8bb39d98d
* commit '
c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
Chris Craik [Wed, 4 Nov 2015 20:21:13 +0000 (20:21 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b am:
8b581e2bc7 am:
a853bb450c
am:
34e9b5b2e4
* commit '
34e9b5b2e418dd43e374dcbb3be27710c53d4b9c':
Early return when the scale is 0.
Jason Monk [Wed, 4 Nov 2015 20:19:18 +0000 (20:19 +0000)]
Merge "First pass at drawer support for SettingsLib"
Riley Andrews [Wed, 4 Nov 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 20:17:15 +0000 (20:17 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8 am:
62b16e2e10 am:
1938c39f77
am:
289c3ba2c4 -s ours
* commit '
289c3ba2c4b4d97108fc79977339e7bf7b585f7f':
Remove -ffast-math from libhwui makefile
Jason Monk [Wed, 4 Nov 2015 18:16:00 +0000 (13:16 -0500)]
Settings Drawer: Handle multi-profile/user correctly
Change-Id: Ibef3cb38325415d514dc86fcd4ce7b95825361f8
Jason Monk [Tue, 3 Nov 2015 23:24:29 +0000 (18:24 -0500)]
First pass at drawer support for SettingsLib
Change-Id: I9669bd511dd3c4b7f59b8600a5af65d9837af015
Chris Craik [Wed, 4 Nov 2015 19:46:47 +0000 (19:46 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b am:
8b581e2bc7
am:
a853bb450c
* commit '
a853bb450ce7e6f06220a86dcc171a837d30511b':
Early return when the scale is 0.
Julia Reynolds [Wed, 4 Nov 2015 19:44:49 +0000 (19:44 +0000)]
Merge changes I49660236,I56a7970a
* changes:
Delete unused code.
Unhide setting for CTS testing.
Chris Craik [Wed, 4 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8 am:
62b16e2e10
am:
1938c39f77
* commit '
1938c39f77a52c1058e7b2434bdc5d08ed9053b9':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:40:02 +0000 (19:40 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b
am:
8b581e2bc7
* commit '
8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
am:
10eb6ab94b
* commit '
10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8
am:
62b16e2e10
* commit '
62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
Remove -ffast-math from libhwui makefile
Christopher Tate [Wed, 4 Nov 2015 19:10:48 +0000 (11:10 -0800)]
Make WorkSource version of alarm listener API @SystemApi
WorkSource is not public API but this should be available to
system support modules.
Change-Id: I7283ab8aa5c5e298959d21a5c8fe55ed119bc6a3
Chris Craik [Wed, 4 Nov 2015 19:28:39 +0000 (19:28 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:27:19 +0000 (19:27 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
am:
c4aaf0f4b8
* commit '
c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:20:52 +0000 (19:20 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
Christopher Tate [Wed, 4 Nov 2015 18:45:49 +0000 (10:45 -0800)]
Fix BlobBackupHelper state tracking
The disk-friendly use of BufferedInputStream in state parsing was
actually breaking the state management system when multiple helpers
are involved in backup. The BufferedInputStream would blithely
pre-fetch 8K from the state file -- but that would consume some
state data that the dispatcher and subsequent helpers needed to see
in order to properly evaluate prior state themselves. The contract
here is that when using the helper mechanism, state-data consumption
must *only* consume as much data as the helper originally stored
into the file.
Switching to a direct-read stream instead fixes the problem by
avoiding read overrun. The rest of the changes are expanded
debugging output that made diagnosis possible.
Bug
25473872
Change-Id: I91de38dfec96f589700479f41ac26f144ba4463c
Chong Zhang [Wed, 4 Nov 2015 18:56:34 +0000 (18:56 +0000)]
Merge "Construct ActivityOptions near top level"
Filip Gruszczynski [Wed, 4 Nov 2015 18:55:06 +0000 (18:55 +0000)]
Merge "Remove blink during the freeform -> recents transition."
Adam Lesinski [Wed, 4 Nov 2015 18:50:27 +0000 (18:50 +0000)]
Merge "Use wakeup reason when FingerPrint sensor wakes up the device"
Geoff Mendal [Wed, 4 Nov 2015 18:44:31 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours am:
c5b905f500 -s ours
am:
6df893939e -s ours
* commit '
6df893939e765d910748cfd8a42473793919e9f3':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:43:11 +0000 (18:43 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am:
e22d81debd
am:
891e52ba29
* commit '
891e52ba296a33d0e51befa209c1ce14a2746991':
John Reck [Wed, 4 Nov 2015 18:41:49 +0000 (18:41 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04 am:
26f50df754
am:
392b0926aa -s ours
* commit '
392b0926aa19ae3856bfddbbeeeb7639f051a86b':
Revert "Use clang for libhwui"
Chong Zhang [Wed, 4 Nov 2015 01:27:26 +0000 (17:27 -0800)]
Construct ActivityOptions near top level
This saves some duplicate constructions of the ActivityOptions
object from Bundle.
Bug:
23755120
Change-Id: Ie8be54a2e4e84a6a1f3c51e4f2966f7fb0bf1c28
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.
b/
24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit
8d0ec389531d071529fb0a800f10733b057205d9)
Geoff Mendal [Wed, 4 Nov 2015 18:28:47 +0000 (18:28 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours am:
d4d6fdefdf -s ours am:
7c941cd30c -s ours
am:
68b7d59f3e -s ours
* commit '
68b7d59f3e278fb18ec6f2631f60341df40b0abc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours
am:
c5b905f500 -s ours
* commit '
c5b905f50069233c2769352a0614605b3ad348f8':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:22:58 +0000 (18:22 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am:
e22d81debd
* commit '
e22d81debd8f2ac9432f42e4c1908da4400a1a29':
John Reck [Wed, 4 Nov 2015 18:21:35 +0000 (18:21 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04
am:
26f50df754
* commit '
26f50df75477a18e40c6da59a15cc2bd4b441239':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:19:40 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours am:
d4d6fdefdf -s ours
am:
7c941cd30c -s ours
* commit '
7c941cd30c9c958c4776126f9f16b343f1f10ff3':
Import translations. DO NOT MERGE
Chris Craik [Wed, 4 Nov 2015 18:12:28 +0000 (10:12 -0800)]
Remove -ffast-math from libhwui makefile
bug:
25417885
Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
Geoff Mendal [Wed, 4 Nov 2015 18:12:19 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours
am:
cbe037b01a -s ours
* commit '
cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:11:21 +0000 (18:11 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
John Reck [Wed, 4 Nov 2015 18:10:52 +0000 (18:10 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
John Reck [Wed, 4 Nov 2015 18:09:49 +0000 (18:09 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:08:13 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours
am:
d4d6fdefdf -s ours
* commit '
d4d6fdefdf83018e46e8de56f0e1679954bb398a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8e7ab07ce7 -s ours
* commit '
8e7ab07ce76c20da653e098adfe38da867753305':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am:
1e1fbd804b
* commit '
1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am:
4c9cdbc7ba -s ours
* commit '
4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
Filip Gruszczynski [Tue, 3 Nov 2015 23:53:55 +0000 (15:53 -0800)]
Remove blink during the freeform -> recents transition.
We achieve the desired result by prolonging the last frame of the
animation until recents tells that it drew its content. The CL also
includes cleanup that moves code that depends heavily on WindowState
fields into that class.
Bug:
24913782
Change-Id: I5ee5b18504dd4a86c24033d17eca21cd31936bca
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:47:04 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
John Reck [Wed, 4 Nov 2015 17:24:07 +0000 (17:24 +0000)]
Merge "Fix GCC build"
Geoff Mendal [Wed, 4 Nov 2015 17:16:22 +0000 (11:16 -0600)]
Import translations. DO NOT MERGE
Change-Id: I84475a6361421bfbe49288943a14f1c8996a7801
Auto-generated-cl: translation import
Clara Bayarri [Thu, 22 Oct 2015 15:09:52 +0000 (16:09 +0100)]
Intercept activity start with ConfirmCredentials
When the calling user is a work profile and the device has
file based encryption enabled, show the work challenge via the
Confirm Credentials APIs before launching the requested activity.
A companion CL in Settings will add support to the Confirm
Credentials flow to read the given intent extra and fire it when
the authorization succeeds.
This is part of the Separate Work Challenge feature.
Note nobody will see this yet as the feature is conditioned by
file based encryption.
Change-Id: I303890095936b1fd1f6a99d645724dffba144345
Clara Bayarri [Wed, 4 Nov 2015 16:35:51 +0000 (16:35 +0000)]
Merge "Create a File Based Encryption check API"
Glenn Kasten [Wed, 4 Nov 2015 16:27:58 +0000 (16:27 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82 am:
1104180301
am:
d1323e9b70
* commit '
d1323e9b70f94796491cad4132982fd4664395b0':
Built-in mic is not used when USB mic is disconnected
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
Glenn Kasten [Wed, 4 Nov 2015 16:19:36 +0000 (16:19 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82
am:
1104180301
* commit '
110418030167702f29fa686616d68fc62f9c0995':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
John Reck [Wed, 4 Nov 2015 15:39:44 +0000 (07:39 -0800)]
Fix GCC build
Change-Id: I990993b8b751bdaf41ce4db1aa7e28823f296777
Alan Viverette [Wed, 4 Nov 2015 15:22:58 +0000 (15:22 +0000)]
Merge "Reduce CascadingMenuPopup's reliance on internal ListView state"
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"
Bug
25462107
This reverts commit
d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
Alan Viverette [Wed, 4 Nov 2015 15:09:27 +0000 (15:09 +0000)]
Merge "Always call legacy performLongClick()"
Geoff Mendal [Wed, 4 Nov 2015 15:03:47 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 14:56:32 +0000 (06:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8adfd4484cde6c32adab9b939cb7698370e2ec6f
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 14:44:20 +0000 (14:44 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev am:
1c442aca0a
am:
7cdbfaf459
* commit '
7cdbfaf459ede7ede430188ed4b1a990ba762144':
Remove auto-boxing during the inflate
Diego Perez [Wed, 4 Nov 2015 14:42:58 +0000 (14:42 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev am:
7dda46e740
am:
724af9ce6f
* commit '
724af9ce6fceb9ddf2ef4536d0da41a520928d5e':
Update StaticLayout_Delegate to use new nLoadHyphenator
Diego Perez [Wed, 4 Nov 2015 14:35:39 +0000 (14:35 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am:
1c442aca0a
* commit '
1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
Remove auto-boxing during the inflate
Geoff Mendal [Wed, 4 Nov 2015 14:35:29 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours am:
b67481b336 -s ours
am:
9a4b6b9094 -s ours
* commit '
9a4b6b909487b61120fb085864533b70a9dabeb8':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:34:19 +0000 (14:34 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am:
7dda46e740
* commit '
7dda46e740250d753bb9d01e129e91695ab8cfe2':
Update StaticLayout_Delegate to use new nLoadHyphenator
Geoff Mendal [Wed, 4 Nov 2015 14:34:12 +0000 (14:34 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours am:
5bf5deb84c -s ours
am:
f587cfec79 -s ours
* commit '
f587cfec79cd6eaab2b83b902ab5663b6adbfb86':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:27:19 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours
am:
b67481b336 -s ours
* commit '
b67481b336d211c6d96e2110e865b55f615fd9df':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev