OSDN Git Service
Jason Monk [Wed, 11 Jan 2017 19:32:58 +0000 (14:32 -0500)]
Move all time ticks to bg handlers, and post
This will hopefully avoid blaming sysui for ANRs when the system
is hosed.
Test: Manual, build, push, wait for time to change
Change-Id: I1661ac1a997ad8917b449dd175229d8b77f583c9
Andrei Stingaceanu [Fri, 13 Jan 2017 14:12:37 +0000 (14:12 +0000)]
Merge "AutoSize TextView (part 6) - introduce autoSizeMaxTextSize"
TreeHugger Robot [Fri, 13 Jan 2017 13:28:49 +0000 (13:28 +0000)]
Merge "Fix bad merge"
Jorim Jaggi [Fri, 13 Jan 2017 12:00:42 +0000 (13:00 +0100)]
Fix bad merge
Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes:
34227241
Andrei Stingaceanu [Wed, 14 Dec 2016 17:38:19 +0000 (17:38 +0000)]
AutoSize TextView (part 6) - introduce autoSizeMaxTextSize
Using textSize as maxTextSize for autosizing is buggy and
unclean. Introduce and use new autoSizeMaxTextSize attribute for
TextView.
Also while doing this optimized the auto-size process by removing
unnecessary computations:
1. If auto-size is enabled than setTextSize(...) is no-op.
2. After setting the text size internally and from the auto-size
context onMeasure() will stop doing another round of redundant
measurements..
Bug:
33449596
Bug:
32221168
Test: atttached in the same topic
Change-Id: Ieecaea6df0aebb4c182bdd1114e3c6fc5066bed1
Andrew Scull [Fri, 13 Jan 2017 11:49:17 +0000 (11:49 +0000)]
Merge "Save password metrics on non-FBE devices."
TreeHugger Robot [Fri, 13 Jan 2017 11:44:31 +0000 (11:44 +0000)]
Merge "Remove dependence on SkTRegistry"
Michal Karpinski [Fri, 13 Jan 2017 09:58:11 +0000 (09:58 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev am:
54b7388163
am:
3f0307c050
Change-Id: I6ac0f419c6dc2f5ffe03181b15d865930731d07d
Michal Karpinski [Fri, 13 Jan 2017 09:56:58 +0000 (09:56 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism am:
4da4a5d0c8
am:
f27cc410dd
Change-Id: I2762db1be4849841089e43c0adb2868bce3d9551
Michal Karpinski [Fri, 13 Jan 2017 09:51:32 +0000 (09:51 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
am:
54b7388163
Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
Michal Karpinski [Fri, 13 Jan 2017 09:51:27 +0000 (09:51 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism
am:
4da4a5d0c8
Change-Id: I6318392173aeb2653734537569d03158799a099c
Michal Karpinski [Fri, 13 Jan 2017 09:47:21 +0000 (09:47 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
Winson Chung [Fri, 13 Jan 2017 07:02:46 +0000 (07:02 +0000)]
Merge "Ensure that we always resume task overlay activities if requested."
Keisuke Kuroyanagi [Fri, 13 Jan 2017 06:39:18 +0000 (06:39 +0000)]
Merge "Make selection end handle stick to selection at line end."
Manu Cornet [Fri, 13 Jan 2017 02:42:05 +0000 (02:42 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev am:
2660111259
am:
4c7317373c -s ours
Change-Id: I7054561b72b89871318e17c2948c69a85bd654d5
Manu Cornet [Fri, 13 Jan 2017 02:40:56 +0000 (02:40 +0000)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents am:
da5900d0a7
am:
afd96a08b1 -s ours
Change-Id: Ifbec27e0e264fc9a3303da18fdcb75a3cb4bd7d1
Manu Cornet [Fri, 13 Jan 2017 02:36:06 +0000 (02:36 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
am:
2660111259
Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
Manu Cornet [Fri, 13 Jan 2017 02:36:02 +0000 (02:36 +0000)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
am:
da5900d0a7
Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
TreeHugger Robot [Fri, 13 Jan 2017 02:31:08 +0000 (02:31 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
Eugene Susla [Fri, 13 Jan 2017 02:26:33 +0000 (02:26 +0000)]
Merge "Only send cache event if cache is detected to be used"
Bo Hu [Fri, 13 Jan 2017 02:16:21 +0000 (02:16 +0000)]
Merge "Emulator: remove hardcoded isEmulator() logic in ImageWallpaper"
Roozbeh Pournader [Fri, 13 Jan 2017 01:53:11 +0000 (01:53 +0000)]
Merge "Treat Latin American locales specially"
Winson Chung [Thu, 12 Jan 2017 23:54:12 +0000 (15:54 -0800)]
Ensure that we always resume task overlay activities if requested.
- Distinguish between task overlays that need to be resumed and
those that should not.
Bug:
34240533
Test: Open PiP, tap to show menu.
Change-Id: Ibdb54d544c501a492260f02cdc2de40c5c1a66d1
Manu Cornet [Thu, 12 Jan 2017 23:05:13 +0000 (15:05 -0800)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
TreeHugger Robot [Fri, 13 Jan 2017 00:51:18 +0000 (00:51 +0000)]
Merge "Add logging constants for Settings search screen"
Manu Cornet [Fri, 13 Jan 2017 00:36:25 +0000 (00:36 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev am:
5ee87b5b6a
am:
ae5df0544a
Change-Id: I4f606540611dc5afaa9577c03afae8b7fc00528f
Manu Cornet [Fri, 13 Jan 2017 00:35:10 +0000 (00:35 +0000)]
2D Recents: Use a different task dismiss animation am:
5df7667edb
am:
bc6bdb3ef8
Change-Id: Ia6eddc26efd3ab101f575bdb06b10691a2346cbc
Manu Cornet [Fri, 13 Jan 2017 00:28:26 +0000 (00:28 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
am:
5ee87b5b6a
Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
Manu Cornet [Fri, 13 Jan 2017 00:28:19 +0000 (00:28 +0000)]
2D Recents: Use a different task dismiss animation
am:
5df7667edb
Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
Manu Cornet [Fri, 13 Jan 2017 00:23:44 +0000 (00:23 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
Ashutosh Joshi [Thu, 12 Jan 2017 23:50:01 +0000 (23:50 +0000)]
Merge "Add a callback handler for nanoApp aborts."
Ta-wei Yen [Thu, 12 Jan 2017 23:47:55 +0000 (23:47 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
Android Build Merger (Role) [Thu, 12 Jan 2017 23:26:33 +0000 (23:26 +0000)]
Merge "Merge "Add support for FDN contact dial" am:
082b118641 am:
24dea10375 am:
503d8fbb26 am:
907585c004"
TreeHugger Robot [Thu, 12 Jan 2017 23:25:46 +0000 (23:25 +0000)]
Merge "Add activity action for Configure Wi-Fi settings."
Robert Greenwalt [Thu, 12 Jan 2017 23:25:36 +0000 (23:25 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641 am:
24dea10375 am:
503d8fbb26
am:
907585c004
Change-Id: I05a4da02d0253eec03174277be22fc2daabad774
Robert Greenwalt [Thu, 12 Jan 2017 23:20:45 +0000 (23:20 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641 am:
24dea10375
am:
503d8fbb26
Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
Robert Greenwalt [Thu, 12 Jan 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641
am:
24dea10375
Change-Id: I5091d35ff79eff952c57109ce120369c95309598
Todd Kennedy [Thu, 12 Jan 2017 23:13:58 +0000 (23:13 +0000)]
Merge "Allow starting ephemeral apps from 'am'"
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am:
082b118641
Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"
Ta-wei Yen [Thu, 12 Jan 2017 19:19:59 +0000 (11:19 -0800)]
Add getNetworkSpecifier() and getCarrierConfig()
cherry-pick of https://android-review.googlesource.com/#/c/318111/
This allows making network request and getting carrier config on a
specfic SIM.
Bug:
32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
Merged-In: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
# Conflicts:
# telephony/java/android/telephony/TelephonyManager.java
Todd Kennedy [Thu, 12 Jan 2017 22:57:52 +0000 (22:57 +0000)]
Merge "Turn off caching temporarily until we can address some of the issues."
Todd Kennedy [Thu, 12 Jan 2017 22:56:44 +0000 (22:56 +0000)]
Turn off caching temporarily until we can address some of the issues.
Revert "PackageManagerService: Enable package parse cache."
This reverts commit
6453db68ca47cd9c686142b8eab3c98f51fd19b4.
Change-Id: I88b6e08a64827550abda91df2dc06611cedeab62
TreeHugger Robot [Thu, 12 Jan 2017 22:21:49 +0000 (22:21 +0000)]
Merge "Add structured sort data to ContentResolver.query."
TreeHugger Robot [Thu, 12 Jan 2017 22:03:04 +0000 (22:03 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 21:53:42 +0000 (21:53 +0000)]
Merge "Dispatch task change notifications to local callbacks in same thread"
TreeHugger Robot [Thu, 12 Jan 2017 21:49:32 +0000 (21:49 +0000)]
Merge "Fix autobundling."
Andrew Sapperstein [Thu, 12 Jan 2017 21:39:35 +0000 (21:39 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev am:
1f2769189d
am:
b5571b1a18
Change-Id: I9b4b95e355640479fc114dc145bafb8316346c92
Chris Wren [Thu, 12 Jan 2017 21:38:28 +0000 (21:38 +0000)]
Create a global registry for system message IDs am:
117d5b4f28
am:
99a16ab0ec -s ours
Change-Id: I9d6eb2d464c19e7f0f6c16a85a783c80b9e648e2
Calin Juravle [Thu, 12 Jan 2017 21:35:56 +0000 (21:35 +0000)]
Merge "Refactor PackageDexOptimizer"
Andrew Sapperstein [Thu, 12 Jan 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
am:
1f2769189d
Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
Chris Wren [Thu, 12 Jan 2017 21:23:11 +0000 (21:23 +0000)]
Create a global registry for system message IDs
am:
117d5b4f28
Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
Andrew Sapperstein [Thu, 12 Jan 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 20:54:48 +0000 (20:54 +0000)]
Merge "Send Snooze callback for Assistant"
bohu [Thu, 12 Jan 2017 20:46:46 +0000 (12:46 -0800)]
Emulator: remove hardcoded isEmulator() logic in ImageWallpaper
Emulator can use host GPU for rendering and supports GLES 2 already.
The isEmulator() logic is not only unnecessary but also causes the
launcher to have black background.
BUG:
33788018
Change-Id: Ib6d942490e8808e202c444f96becec1b75953838
Mark Salyzyn [Wed, 28 Sep 2016 23:15:30 +0000 (16:15 -0700)]
Replace cutils/log.h and android/log.h with log/log.h
Test: compile
Bug:
34250038
Change-Id: I42185a879beaa9bb244f53a968800392b854ac45
TreeHugger Robot [Thu, 12 Jan 2017 19:38:49 +0000 (19:38 +0000)]
Merge "Compile bit on darwin, use -j when invoking make"
Andrew Rossignol [Thu, 12 Jan 2017 19:08:24 +0000 (19:08 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev am:
c65a010a39 -s ours
am:
6ebc52a950 -s ours
Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6
Andrew Rossignol [Thu, 12 Jan 2017 19:07:25 +0000 (19:07 +0000)]
Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" am:
57edeef91a -s ours
am:
4fa95e7bbb -s ours
Change-Id: If522327abdedb779d2a60be7dafa08701bfde0ac
Jiaquan He [Thu, 12 Jan 2017 19:03:27 +0000 (19:03 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev am:
5c4c5e1682
am:
97b832a438
Change-Id: I14cfb594bbeecbcd8b86ea0b6931891ed93b82cb
Jiaquan He [Thu, 12 Jan 2017 19:02:18 +0000 (19:02 +0000)]
2D Recents: Show shadows behind task views. am:
15fa3246d8
am:
0cb857822e
Change-Id: Ice75a09a845ed8639c11053a3428f0b01fc40ded
Andrew Rossignol [Thu, 12 Jan 2017 18:59:56 +0000 (18:59 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
am:
c65a010a39 -s ours
Change-Id: I39efaeb589830e7d448e208d37a079c798477224
Andrew Rossignol [Thu, 12 Jan 2017 18:59:51 +0000 (18:59 +0000)]
Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"
am:
57edeef91a -s ours
Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
Shukang Zhou [Thu, 12 Jan 2017 18:59:26 +0000 (18:59 +0000)]
Merge "Close a file descriptor before losing its reference."
Jiaquan He [Thu, 12 Jan 2017 18:56:34 +0000 (18:56 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
am:
5c4c5e1682
Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
Jiaquan He [Thu, 12 Jan 2017 18:56:27 +0000 (18:56 +0000)]
2D Recents: Show shadows behind task views.
am:
15fa3246d8
Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
TreeHugger Robot [Thu, 12 Jan 2017 18:52:38 +0000 (18:52 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
Jiaquan He [Thu, 12 Jan 2017 18:50:06 +0000 (18:50 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
Selim Cinek [Thu, 12 Jan 2017 18:48:04 +0000 (18:48 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev am:
c1c7d1f938
am:
8b36bbf0ea -s ours
Change-Id: I8b7cba700a76670ce67ec8e3fe377fd16f7df78d
Selim Cinek [Thu, 12 Jan 2017 18:46:57 +0000 (18:46 +0000)]
Fixed a bug where notifications could stay expanded am:
b2236108ae
am:
97f14c47db -s ours
Change-Id: I8871b9f79245de04271894a6e2e508b1c55280de
Selim Cinek [Thu, 12 Jan 2017 18:42:41 +0000 (18:42 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
am:
c1c7d1f938
Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
Selim Cinek [Thu, 12 Jan 2017 18:42:32 +0000 (18:42 +0000)]
Fixed a bug where notifications could stay expanded
am:
b2236108ae
Change-Id: I9c776321f0865f6971692008256cd80adbab5469
Ben Wagner [Thu, 12 Jan 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Use FatVector instead of SkAutoMalloc in VulkanManager."
Calin Juravle [Wed, 4 Jan 2017 21:22:14 +0000 (13:22 -0800)]
Refactor PackageDexOptimizer
Split performDexoptLI in multiple smaller helpers. This will help in
adding the logic to process secondary dex files.
The goal is to move towards simple logic which can be reused between
compiling the package's code and its secondary dex files.
Test: device boots, packages get compiled in the background job,
adb shell cmd package compile -m speed|speed-profile packageName
Bug:
32871170
Change-Id: I2d55edf42baa768f990939a82b3d52edf5f68a2c
Selim Cinek [Thu, 12 Jan 2017 18:37:04 +0000 (18:37 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
Julia Reynolds [Thu, 12 Jan 2017 18:33:15 +0000 (13:33 -0500)]
Fix autobundling.
Test: manual
Change-Id: I9071b3e52172d152a4ccd685f4fd41944d2e40c9
Yorke Lee [Fri, 6 Jan 2017 22:59:58 +0000 (14:59 -0800)]
Dispatch task change notifications to local callbacks in same thread
Currently, task change notifications are dispatched to the
listeners on a separate thread even if the callback lives in
the system process. As a result, they happen too late to
respond to certain key events in a task's state change.
This CL fixes this issue by tracking local and remote listeners
separately, and notifying local listeners directly instead of
on the handler thread.
Test: Manual - verify that local callbacks delivered to the
TaskWindowPlacer are called in the same thread as the main
ActivityManager thread.
Test: run TaskStackChangedListenerTest
Bug:
33664258
Change-Id: I92f20d539558054368acfa836bd2476e9ae81b33
Winson Chung [Thu, 12 Jan 2017 18:17:32 +0000 (18:17 +0000)]
Merge "Replacing removed string."
Android Build Merger (Role) [Thu, 12 Jan 2017 17:41:09 +0000 (17:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
2f9af2aa69 -s ours am:
04f8ba7bb7 -s ours"
Bill Yi [Thu, 12 Jan 2017 17:40:23 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
2f9af2aa69 -s ours
am:
04f8ba7bb7 -s ours
Change-Id: I4f4317d788bff53bf621b06a6e01498f8497253a
Android Build Merger (Role) [Thu, 12 Jan 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE am:
50a1d26ac0 -s ours am:
5aef5be20b -s ours"
TreeHugger Robot [Thu, 12 Jan 2017 17:39:11 +0000 (17:39 +0000)]
Merge changes I2ff9bd44,I946e681e,If72df07b
* changes:
Handle content insets for snapshots
Always remove starting window in performShow
Initial implementation of snapshots
Bill Yi [Thu, 12 Jan 2017 17:39:08 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE am:
50a1d26ac0 -s ours
am:
5aef5be20b -s ours
Change-Id: Ic265b2d560bfdd3b2705bd026c4d964f84bacb64
Bill Yi [Thu, 12 Jan 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
57988f49e6 -s ours
am:
ae29fff572 -s ours
Change-Id: I560ca020942b2aca573f467307ef36dd77885d36
Bill Yi [Thu, 12 Jan 2017 17:36:45 +0000 (17:36 +0000)]
Import translations. DO NOT MERGE am:
8c90b5ace0 -s ours
am:
349e01836f -s ours
Change-Id: I253aeb9193b6e9e24b02be1fd09de4fdf3a0bc4d
Andre Eisenbach [Thu, 12 Jan 2017 17:30:55 +0000 (17:30 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e am:
2d0ad3a9e7 am:
e81838f7e1
am:
efb1bda2d6
Change-Id: I8144d1e2c856304982679c35faa401f0aad5478f
Selim Cinek [Thu, 12 Jan 2017 17:28:47 +0000 (17:28 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am:
c687aa08c1
am:
5736b1689a -s ours
Change-Id: I2be4e7e3f4b2830953e7f7b11994274c997f0b3e
Selim Cinek [Thu, 12 Jan 2017 17:27:44 +0000 (17:27 +0000)]
Allowing heads-up notifications now on the lock screen am:
ab24dc9f29
am:
f6c9c21745 -s ours
Change-Id: I7435ec86716e0beae9e4c429f12e9ab026360577
Selim Cinek [Thu, 12 Jan 2017 17:26:51 +0000 (17:26 +0000)]
Introduced the visual stability manager am:
add9526b1d
am:
85e481140c -s ours
Change-Id: I43f51b10146356ce03264f059338d6c1431715ed
Selim Cinek [Thu, 12 Jan 2017 17:25:58 +0000 (17:25 +0000)]
Removing notifications always immediately when swiping them away am:
5e018206e2
am:
fabd50de62 -s ours
Change-Id: I75b2f037bd925aa74db0a43a7513275aacdcfea2
Bill Yi [Thu, 12 Jan 2017 17:24:45 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
2f9af2aa69 -s ours
Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
Bill Yi [Thu, 12 Jan 2017 17:24:41 +0000 (17:24 +0000)]
Import translations. DO NOT MERGE
am:
50a1d26ac0 -s ours
Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
Mark Salyzyn [Thu, 12 Jan 2017 17:22:56 +0000 (17:22 +0000)]
Merge "resolve merge conflicts of
ec7e2a164c37 to master"
Bill Yi [Thu, 12 Jan 2017 17:22:54 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
57988f49e6 -s ours
Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
Bill Yi [Thu, 12 Jan 2017 17:22:50 +0000 (17:22 +0000)]
Import translations. DO NOT MERGE
am:
8c90b5ace0 -s ours
Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
TreeHugger Robot [Thu, 12 Jan 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 17:20:05 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 17:19:00 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Thu, 12 Jan 2017 17:18:19 +0000 (17:18 +0000)]
Merge "Fix the build!"
TreeHugger Robot [Thu, 12 Jan 2017 17:17:46 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
OSDN Git Service
