OSDN Git Service
Adrian Roos [Wed, 24 May 2017 21:13:13 +0000 (21:13 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev am:
246a2c90ac
am:
90871e5ba5
Change-Id: Iaa46cc13a0196168581103d80dc804cbeb40310c
Abodunrinwa Toki [Wed, 24 May 2017 21:11:02 +0000 (21:11 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev am:
834f257f22
am:
c687b62ce0
Change-Id: I811f5ce2af5f61b8be8dfbe5a875ec82e2adc3dc
Selim Cinek [Wed, 24 May 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev am:
20e1c8c0f5
am:
e249544b1a
Change-Id: Ibd37dee4154d9a478de8c0c6ee9907c2b64fc9c9
Adrian Roos [Wed, 24 May 2017 21:01:46 +0000 (21:01 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev
am:
246a2c90ac
Change-Id: I36f60a7e64b38e7abdbb59b629997f4214db9b3f
Todd Kennedy [Wed, 24 May 2017 21:01:01 +0000 (21:01 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev am:
1de10d6602
am:
4cdc26746e
Change-Id: I2a66bfa001ea03205535bc0337f720d869fa9132
Abodunrinwa Toki [Wed, 24 May 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev
am:
834f257f22
Change-Id: Ia2a226edb48340774a7d9c79b6a7f113241a3df0
Selim Cinek [Wed, 24 May 2017 20:52:13 +0000 (20:52 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev
am:
20e1c8c0f5
Change-Id: Ic4f94667f2349be270f5cfff50e77d66e9b8f4ce
TreeHugger Robot [Wed, 24 May 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev
Todd Kennedy [Wed, 24 May 2017 20:49:59 +0000 (20:49 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev
am:
1de10d6602
Change-Id: I70d707c25ed793bd2ad8e58f3558d2a4d0b6e980
Abodunrinwa Toki [Wed, 24 May 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Regression test: Menu item title updates." into oc-dev
Brad Ebinger [Wed, 24 May 2017 20:46:26 +0000 (20:46 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504 am:
8498a6cffd am:
ddd73513e6
am:
8187781e37
Change-Id: I80f11d2c105eeeb08f37f9b6083b9709cae5453f
Selim Cinek [Wed, 24 May 2017 20:44:56 +0000 (20:44 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev
Roshan Pius [Wed, 24 May 2017 20:40:47 +0000 (20:40 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev am:
131eaa7865
am:
6bc34f3c1e
Change-Id: Ide1d8d479467bd75fcfe5e611b3f849e5cd73887
Brad Ebinger [Wed, 24 May 2017 20:39:46 +0000 (20:39 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504 am:
8498a6cffd
am:
ddd73513e6
Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b
TreeHugger Robot [Wed, 24 May 2017 20:38:51 +0000 (20:38 +0000)]
Merge "System installed launcher can see instant apps" into oc-dev
Christopher Ferris [Wed, 24 May 2017 20:36:22 +0000 (20:36 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev am:
8e3b379394
am:
1ef9fe7c52
Change-Id: Ie952cb856b2d0149cd276604262ccb3b060e98bc
Brad Ebinger [Wed, 24 May 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504
am:
8498a6cffd
Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97
Roshan Pius [Wed, 24 May 2017 20:31:21 +0000 (20:31 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev
am:
131eaa7865
Change-Id: I954fd52c87f3b447469af898ca77dde2a4707346
Christopher Ferris [Wed, 24 May 2017 20:28:24 +0000 (20:28 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev
am:
8e3b379394
Change-Id: I24f8e5f7f2259feb6564390f24303991f580a76d
Selim Cinek [Wed, 24 May 2017 20:28:22 +0000 (20:28 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev am:
5d8e4c4773
am:
087b208a25
Change-Id: I315f3ce8d5a92fbacb737d8a631f17e30074e9db
Brad Ebinger [Wed, 24 May 2017 20:27:48 +0000 (20:27 +0000)]
Merge "Support RRO for emergency number conversion map"
am:
671680e504
Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
Selim Cinek [Wed, 24 May 2017 20:21:08 +0000 (20:21 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev
am:
5d8e4c4773
Change-Id: I1c1c0693131e9075fe2830936cd6ee3e3081912a
TreeHugger Robot [Wed, 24 May 2017 20:20:58 +0000 (20:20 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev
Christopher Ferris [Wed, 24 May 2017 20:20:38 +0000 (20:20 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev
Brad Ebinger [Wed, 24 May 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Support RRO for emergency number conversion map"
Selim Cinek [Wed, 24 May 2017 20:13:18 +0000 (20:13 +0000)]
Merge "Fixed an issue where the panel could be stuck expanding" into oc-dev
Adam Powell [Wed, 24 May 2017 20:09:20 +0000 (20:09 +0000)]
Merge "Disable state save/restore for inflated date/time picker views" into oc-dev am:
7f517b2fe6
am:
a59d91d541
Change-Id: I853e8b3c22f51a5f84ada0df9621a6c469e08124
Adam Powell [Wed, 24 May 2017 20:01:08 +0000 (20:01 +0000)]
Merge "Disable state save/restore for inflated date/time picker views" into oc-dev
am:
7f517b2fe6
Change-Id: Ifb028e4be2e1657a5a1e7e39b23a981bc21d26f5
Todd Kennedy [Wed, 24 May 2017 20:00:22 +0000 (20:00 +0000)]
Merge "Filter instant <--> full app" into oc-dev am:
4d3d035255
am:
74877d44b6
Change-Id: I40bbc047442e15ea9417588d75ed4f94e9e38ac4
Todd Kennedy [Wed, 24 May 2017 19:54:29 +0000 (19:54 +0000)]
Merge "Filter instant <--> full app" into oc-dev
am:
4d3d035255
Change-Id: I519db1234ac4ba8acfe06c694f69fdf36eac1b6c
TreeHugger Robot [Wed, 24 May 2017 19:50:51 +0000 (19:50 +0000)]
Merge "Disable state save/restore for inflated date/time picker views" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 19:45:27 +0000 (19:45 +0000)]
Merge "Filter instant <--> full app" into oc-dev
Jason Monk [Wed, 24 May 2017 19:45:22 +0000 (19:45 +0000)]
Merge "Fix cast tile crash" into oc-dev am:
a69a6ed505
am:
42c148fb76
Change-Id: Ic11a61f05340f0b859b093c3a095c81538754f36
TreeHugger Robot [Wed, 24 May 2017 19:43:42 +0000 (19:43 +0000)]
Merge "Set up empty lines for DynamicLayout#updateBlocks() tests"
Jason Monk [Wed, 24 May 2017 19:37:27 +0000 (19:37 +0000)]
Merge "Fix cast tile crash" into oc-dev
am:
a69a6ed505
Change-Id: Ic451cd15fe26c35d9db514071706a42414e8af98
TreeHugger Robot [Wed, 24 May 2017 19:29:54 +0000 (19:29 +0000)]
Merge "Fix cast tile crash" into oc-dev
Adrian Roos [Wed, 24 May 2017 19:25:27 +0000 (19:25 +0000)]
Merge "Notifications: Fix janky group expansion animation" into oc-dev am:
add77afe43
am:
f6f58c02b2 -s ours
Change-Id: I8e41f0bfe909438580a2f186e27ffb82e9f92cb7
Wale Ogunwale [Wed, 24 May 2017 19:17:12 +0000 (19:17 +0000)]
Merge "Reset mHiddenSetFromTransferredStartingWindow when app set visibility" into oc-dev am:
0ad27a747a
am:
6c6c55c427
Change-Id: I5330d02f53efe86e1de4328e4816a6e6602a210f
Adrian Roos [Wed, 24 May 2017 19:12:16 +0000 (19:12 +0000)]
Merge "Notifications: Fix janky group expansion animation" into oc-dev
am:
add77afe43
Change-Id: Ib0bb913ea12ad700fe0753ed4dbab48fc47dc0e3
Wale Ogunwale [Wed, 24 May 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Reset mHiddenSetFromTransferredStartingWindow when app set visibility" into oc-dev
am:
0ad27a747a
Change-Id: Id8f0192b7d143b7e6e204992f62752c729377111
Adrian Roos [Wed, 24 May 2017 19:03:24 +0000 (19:03 +0000)]
Merge "Notifications: Fix janky group expansion animation" into oc-dev
Adrian Roos [Wed, 24 May 2017 19:02:18 +0000 (19:02 +0000)]
Merge "Notifications: Fix janky group expansion animation"
TreeHugger Robot [Wed, 24 May 2017 19:00:56 +0000 (19:00 +0000)]
Merge "Reset mHiddenSetFromTransferredStartingWindow when app set visibility" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 18:42:57 +0000 (18:42 +0000)]
Merge "fs_stat: ignore timestamp adjustment"
Andreas Gampe [Thu, 11 May 2017 01:53:02 +0000 (18:53 -0700)]
Zygote: Allow arbitrary-length wrap property names
The restriction on system property key length has been lifted.
Update the invoke-with code to first check the full-length property.
Then fall back to the truncated version for backwards-compatibility.
Bug:
37276041
Test: m
Test: manual with long package name (Maps)
(cherry picked from commit
4c88a8c6848609333fa6058fcfc22ac58ed94dac)
Change-Id: Ic27a26a676f7ac5a998a9bea14259725e89b7e37
Andrew Solovay [Wed, 24 May 2017 18:21:17 +0000 (18:21 +0000)]
Merge "docs: Fixing malformatted HTML escape" into oc-dev am:
1272847f1d
am:
670286ea89
Change-Id: I8f9acee143abd62b2d0599ad7ee866235916084d
Andrew Solovay [Wed, 24 May 2017 18:12:06 +0000 (18:12 +0000)]
Merge "docs: Fixing malformatted HTML escape" into oc-dev
am:
1272847f1d
Change-Id: I2161c606de88edb3e36ee8a94a5dda27d15c538c
Andrew Solovay [Wed, 24 May 2017 17:56:23 +0000 (17:56 +0000)]
Merge "docs: Fixing malformatted HTML escape" into oc-dev
Keun-young Park [Wed, 24 May 2017 17:50:15 +0000 (17:50 +0000)]
Merge "reduce flunctuation in boot animation start / stopping time" into oc-dev am:
06fe82293e
am:
dcc539f6ce
Change-Id: I634fb90882b73e7a0bfaebd34f619f0476af16ca
Christopher Ferris [Wed, 24 May 2017 17:42:58 +0000 (17:42 +0000)]
Merge "Set the decay timer for all forked apps." into oc-dev am:
694570957d
am:
38b7320e5d
Change-Id: Ic5a99ad3d338ebc93dcd6fab285c8c5a0fb7e4b0
Keun-young Park [Wed, 24 May 2017 17:39:21 +0000 (17:39 +0000)]
Merge "reduce flunctuation in boot animation start / stopping time" into oc-dev
am:
06fe82293e
Change-Id: I188fab63708e67b70baa2b8e7fb798866f47c9ec
Christopher Ferris [Wed, 24 May 2017 17:32:38 +0000 (17:32 +0000)]
Merge "Set the decay timer for all forked apps." into oc-dev
am:
694570957d
Change-Id: I6e44070a2ffd1629dd2d50ab90831b01474b6353
Jason Monk [Wed, 24 May 2017 17:29:19 +0000 (13:29 -0400)]
Fix cast tile crash
Switch from support library to internal implementation of cast
dialog.
Test: send menu event to dialog
Change-Id: If9c8bf0f544e712f3835977dd45a5adeeaac0c77
Fixes:
37216170
Keun-young Park [Wed, 24 May 2017 17:28:35 +0000 (17:28 +0000)]
Merge "reduce flunctuation in boot animation start / stopping time" into oc-dev
Christopher Ferris [Wed, 24 May 2017 17:17:27 +0000 (17:17 +0000)]
Merge "Set the decay timer for all forked apps." into oc-dev
Roshan Pius [Thu, 11 May 2017 16:05:58 +0000 (09:05 -0700)]
WifiMetrics: Add metrics for HAL/wificond crashes
New metrics added:
1. Number of times HAL crashed during operation.
2. Number of times wificond crashed during operation.
3. Number of times wifi start failed because of a native issue.
Basically the number of times calls to WifiNative.setupForClientMode() &
WifiNative.setupForSoftApMode() fails.
Bug:
36586897
Test: Compiles
Change-Id: Ie9683fd8bfea6b0c64605e407559ff561898c11b
(cherry picked from commit
3607a39bbf99889d964f985727d14bcbdbecfac6)
Android Build Merger (Role) [Wed, 24 May 2017 16:43:30 +0000 (16:43 +0000)]
Merge "Merge "TRON: Smart selection events that don't change the selection." into oc-dev am:
afea5e8ca4 am:
ff4cd1e639"
Zhizhou Yang [Wed, 24 May 2017 16:42:39 +0000 (16:42 +0000)]
Merge "Fix MemoryLeak warning in frameworks/base/services"
Abodunrinwa Toki [Wed, 24 May 2017 16:41:11 +0000 (16:41 +0000)]
Merge "TRON: Smart selection events that don't change the selection." into oc-dev am:
afea5e8ca4
am:
ff4cd1e639
Change-Id: Icf36e4394bfc3bb139cd2a8213c6cec7e8b4f888
Winson Chung [Wed, 24 May 2017 16:36:08 +0000 (16:36 +0000)]
Merge "Fixing crash when checking for home task resizeability." into oc-dev am:
59eab4068b
am:
20417bd9d3
Change-Id: If2d8309d0637a4d877edc9e1f43427c28629712f
zhoulei [Wed, 24 May 2017 16:33:38 +0000 (16:33 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse" am:
8516a2025a am:
19be2ee686 am:
fa3ba65d24
am:
52d40565b8
Change-Id: Iae6af7ea66d1cee70a0c1b46d8ea3a8b04707e98
Tyler Gunn [Wed, 24 May 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete." into oc-dev am:
71d051ad2c
am:
fa9293b183
Change-Id: Ifd91382e1f6e05e0dae7017204ec5e8756c13676
TreeHugger Robot [Wed, 24 May 2017 16:25:40 +0000 (16:25 +0000)]
Merge "resolve merge conflicts of
a5e114333110 to master"
TreeHugger Robot [Wed, 24 May 2017 15:53:33 +0000 (15:53 +0000)]
Merge "Color extraction under Power and Volume menus"
Abodunrinwa Toki [Wed, 24 May 2017 15:52:28 +0000 (15:52 +0000)]
Merge "TRON: Smart selection events that don't change the selection." into oc-dev
am:
afea5e8ca4
Change-Id: I7ccbc308af99399e76eca772e385f2c47fc96d36
TreeHugger Robot [Wed, 24 May 2017 15:51:25 +0000 (15:51 +0000)]
Merge "Unhide system feature flag FEATURE_WIFI_PASSPOINT"
Winson Chung [Wed, 24 May 2017 15:50:09 +0000 (15:50 +0000)]
Merge "Fixing crash when checking for home task resizeability." into oc-dev
am:
59eab4068b
Change-Id: I457f263ef1bb6a8624d60d633565704855a1b0ea
TreeHugger Robot [Wed, 24 May 2017 15:44:32 +0000 (15:44 +0000)]
Merge "TRON: Smart selection events that don't change the selection." into oc-dev
Winson Chung [Wed, 24 May 2017 15:43:54 +0000 (15:43 +0000)]
Merge "Fixing crash when checking for home task resizeability." into oc-dev
Tyler Gunn [Fri, 12 May 2017 17:04:49 +0000 (10:04 -0700)]
Add ConnectionService callback invoked when connection creation complete.
Adding a new @hide callback in ConnectionService which a CS implementation
can implement. A callback from Telecom is responsible for invoking this
method.
Test: Manual
Bug:
33272455
Change-Id: Id17cf0fd8fd491b7677f9b7a7b52c76270b1c8c9
(cherry picked from commit
d104a4f7f67ad6ca098bef0dc3824c5c47e7bcaf)
zhoulei [Wed, 24 May 2017 14:48:36 +0000 (14:48 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse" am:
8516a2025a am:
19be2ee686
am:
fa3ba65d24
Change-Id: Ib96ed1f7f14ee77cf0dadc28db30c2a5c9845e47
Geoffrey Pitsch [Wed, 24 May 2017 14:45:18 +0000 (10:45 -0400)]
resolve merge conflicts of
a5e114333110 to master
Test: runtest systemui
Change-Id: I898b2467474e029cdaba0f9d21fe8fa70dd45318
zhoulei [Wed, 24 May 2017 14:43:04 +0000 (14:43 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse" am:
8516a2025a
am:
19be2ee686
Change-Id: Ie32bf7de581e0a4ec1cdfe36417c9f8fb512932c
zhoulei [Wed, 24 May 2017 14:37:32 +0000 (14:37 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
am:
8516a2025a
Change-Id: I1a2bb68ba34c48261d1c990445b0735d2449e21e
Todd Kennedy [Tue, 23 May 2017 22:54:18 +0000 (15:54 -0700)]
System installed launcher can see instant apps
Change-Id: I97f791b61f9b4f7ed33305345bf3d92394b40ae4
Fixes:
38202759
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual. Create sample app that replaces the launcher to test ability to see ephemeral apps.
Treehugger Robot [Wed, 24 May 2017 14:28:48 +0000 (14:28 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
Tyler Gunn [Wed, 24 May 2017 14:14:47 +0000 (14:14 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete." into oc-dev
am:
71d051ad2c
Change-Id: I901377bda1364f0cb7b28bcb699a647627f775a9
Tyler Gunn [Wed, 24 May 2017 14:07:54 +0000 (14:07 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete." into oc-dev
Todd Kennedy [Tue, 23 May 2017 20:37:30 +0000 (13:37 -0700)]
Filter instant <--> full app
Last in the series for protecting full apps from instant apps. Still
need to make another pass at the opposite direction.
Bug:
35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: I3734cb154e7b952f3a9cf7c5415dffcd4de02aba
Geoffrey Pitsch [Wed, 24 May 2017 13:51:27 +0000 (13:51 +0000)]
Merge "Change Ignores to FlakyTest so we can check if they're fixed" into oc-dev
am:
b61f058f85
Change-Id: I67d730498859e44d50f38c594ce309c46a808f2f
Abodunrinwa Toki [Tue, 23 May 2017 13:51:22 +0000 (14:51 +0100)]
TRON: Smart selection events that don't change the selection.
See Ia9081d92ae9aea50d863455be770eecd0c73be1a for multi-selection
counts.
Test: Manually checked logging happens as per go/tron-howto and verified
nothing is broken in related classes by running:
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug:
32572232
Change-Id: I4ceab136ab73a20c6bc56732f7606ed103fe64d3
Geoffrey Pitsch [Wed, 24 May 2017 13:44:07 +0000 (13:44 +0000)]
Merge "Change Ignores to FlakyTest so we can check if they're fixed" into oc-dev
Wale Ogunwale [Wed, 24 May 2017 12:43:54 +0000 (12:43 +0000)]
Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev am:
7b7e7e1603
am:
d5537addea
Change-Id: Ice50525982315b37787b9da9ae8f38a8aac62229
Wale Ogunwale [Wed, 24 May 2017 12:36:23 +0000 (12:36 +0000)]
Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev
am:
7b7e7e1603
Change-Id: I3fe14c8bf7316b97135dc01286c329deb806824b
Derek Sollenberger [Wed, 24 May 2017 12:28:59 +0000 (12:28 +0000)]
Merge "Remove no-op SkGraphics::term() function."
Wale Ogunwale [Wed, 24 May 2017 12:28:41 +0000 (12:28 +0000)]
Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev
Bill Yi [Wed, 24 May 2017 11:43:41 +0000 (11:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d72d69f45b -s ours
am:
f2b6f10439 -s ours
Change-Id: I53eeb77474ce8d9c822cc6df953aa9f262a0cbdc
Bill Yi [Wed, 24 May 2017 11:41:23 +0000 (11:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7df8f5129a -s ours
am:
1679a515a8 -s ours
Change-Id: I133db1a7c735c9d8d1226adfb9dffe4131a80127
TreeHugger Robot [Wed, 24 May 2017 11:35:48 +0000 (11:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 24 May 2017 11:32:33 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d72d69f45b -s ours
Change-Id: Ib193aa19e764d410ca639a48feee73b8bd84c66c
Bill Yi [Wed, 24 May 2017 11:29:39 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7df8f5129a -s ours
Change-Id: If9f97adf518a824ab53a7fa0fcbe2b2001ba9fbd
TreeHugger Robot [Wed, 24 May 2017 11:23:36 +0000 (11:23 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 24 May 2017 11:22:43 +0000 (11:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 11:22:04 +0000 (11:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 11:00:03 +0000 (11:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Andrei Stingaceanu [Wed, 24 May 2017 09:37:18 +0000 (09:37 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev am:
98891dbb70
am:
9d26cc1129
Change-Id: I09779c5ed7a5161a8396f13a6d8a6af16aaf7cfc
Andrei Stingaceanu [Wed, 24 May 2017 09:24:08 +0000 (09:24 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev
am:
98891dbb70
Change-Id: I21ad151333ac9582951cefa822727b53be747eec
Andrei Stingaceanu [Wed, 24 May 2017 09:16:42 +0000 (09:16 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev
Paul Duffin [Wed, 24 May 2017 08:34:06 +0000 (08:34 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a am:
c1f0962ea7 am:
4b6cf3d841
am:
7812f74234
Change-Id: Ia2ab8836781f3fa98782bc790fc76545c8eecb5a
Paul Duffin [Wed, 24 May 2017 08:27:56 +0000 (08:27 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a am:
c1f0962ea7
am:
4b6cf3d841
Change-Id: I0a4e360b01bf336b26a3a8ccdee200198cdfcb90
OSDN Git Service
