OSDN Git Service
Tyler Gunn [Wed, 24 May 2017 23:01:22 +0000 (23:01 +0000)]
Merge "Add ability to dump events in a timeline view." am:
255a171c5d am:
3b27d69612
am:
a1c225936a
Change-Id: I34c3327e675d1948ae6074337cce800919e03030
Tyler Gunn [Wed, 24 May 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Add ability to dump events in a timeline view." am:
255a171c5d
am:
3b27d69612
Change-Id: I5363916199a33e795fcfb8497815687cda91f6ef
Tyler Gunn [Wed, 24 May 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Add ability to dump events in a timeline view."
am:
255a171c5d
Change-Id: I7bb01946685f4e9c5b60fd0e8e2be4b071fd1a6f
Tyler Gunn [Wed, 24 May 2017 22:36:41 +0000 (22:36 +0000)]
Merge "Add ability to dump events in a timeline view."
Jason Monk [Wed, 24 May 2017 22:05:29 +0000 (22:05 +0000)]
Merge "Fix QS tiles not rippling" into oc-dev
am:
b8e5742f5b
Change-Id: I05ff98435f88ea489a557013fc53a8cfe12304f5
Adrian Roos [Wed, 24 May 2017 22:01:34 +0000 (22:01 +0000)]
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
am:
838e365581
Change-Id: I7140eb9253c84dc35a5f3bf62576e71e4828c6c5
Nathan Harold [Wed, 24 May 2017 21:56:36 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
am:
72cdc9cdae
Change-Id: I7c6360ee53e929e0e03dcd1e1a767d98af94f620
Michael Schwartz [Wed, 24 May 2017 21:50:47 +0000 (21:50 +0000)]
Merge "Check VintfObject compatibility on boot" into oc-dev
am:
4e962321ad
Change-Id: Ie3f55facc983e421432549440a81c1978c3e9482
TreeHugger Robot [Wed, 24 May 2017 21:50:15 +0000 (21:50 +0000)]
Merge "Fix QS tiles not rippling" into oc-dev
Felipe Leme [Wed, 24 May 2017 21:46:30 +0000 (21:46 +0000)]
Merge "Fixed assertions on bugreport share notification." into oc-dev
am:
39b375c9db
Change-Id: I90ec303a24376b63b59dbc0035f56058c062a2af
Ruthwar Kumar Ambeer [Wed, 24 May 2017 21:39:44 +0000 (21:39 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
am:
ef98275635 -s ours
Change-Id: Icf1ff0d9ed2ee86728960f3349762275020f8f10
TreeHugger Robot [Wed, 24 May 2017 21:36:32 +0000 (21:36 +0000)]
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
Nathan Harold [Wed, 24 May 2017 21:36:15 +0000 (21:36 +0000)]
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
Michael Schwartz [Wed, 24 May 2017 21:34:03 +0000 (21:34 +0000)]
Merge "Check VintfObject compatibility on boot" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 21:32:56 +0000 (21:32 +0000)]
Merge "Fixed assertions on bugreport share notification." into oc-dev
TreeHugger Robot [Wed, 24 May 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
Tenghui Zhu [Wed, 24 May 2017 21:17:36 +0000 (21:17 +0000)]
Merge "Add documentation about 0 scale matrix to Shader" into oc-dev
am:
52ca75011b
Change-Id: Ied29af1118f1f5db343c3e3d7218d757b67f61a6
Sergey Vasilinets [Wed, 24 May 2017 21:12:12 +0000 (21:12 +0000)]
Merge "Correctly save retained fragments in the backstack" into oc-dev
am:
ce8a4b89c8
Change-Id: I755b0f38c907d1ae7bf12df67f4b10590a9016bf
Tenghui Zhu [Wed, 24 May 2017 21:06:52 +0000 (21:06 +0000)]
Merge "Add documentation about 0 scale matrix to Shader" into oc-dev
Adrian Roos [Wed, 24 May 2017 21:05:57 +0000 (21:05 +0000)]
Merge "Keyguard: Update clock size" into oc-dev
am:
6441e1064c
Change-Id: I56dae82a5fdefcd088bb0b8ec8eb3cd8a89f7bf7
Sergey Vasilinets [Wed, 24 May 2017 21:05:34 +0000 (21:05 +0000)]
Merge "Correctly save retained fragments in the backstack" into oc-dev
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
Adrian Roos [Wed, 24 May 2017 21:01:39 +0000 (21:01 +0000)]
Merge "Keyguard: Update clock size" into oc-dev
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
Selim Cinek [Wed, 24 May 2017 20:44:56 +0000 (20:44 +0000)]
Merge "Fixed that pinned huns could become clipped" into oc-dev
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
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
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: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 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:37:27 +0000 (19:37 +0000)]
Merge "Fix cast tile crash" into oc-dev
am:
a69a6ed505
Change-Id: Ic451cd15fe26c35d9db514071706a42414e8af98
Jason Monk [Wed, 24 May 2017 19:31:11 +0000 (15:31 -0400)]
Fix QS tiles not rippling
It was due to complicated background changes added for the gutter,
add a transparent background for QS + header to give the ripples
a location to draw on.
Test: visual
Change-Id: I59c2d0b1fb543852e54980577b1ce7307b6e4de8
Fixes:
38330186
TreeHugger Robot [Wed, 24 May 2017 19:29:54 +0000 (19:29 +0000)]
Merge "Fix cast tile crash" into oc-dev
Michael Schwartz [Mon, 15 May 2017 18:40:40 +0000 (11:40 -0700)]
Check VintfObject compatibility on boot
Bug:
36814984
Test: Build, flash boot sailfish and shared system image.
Change-Id: Ibd6694079d9e2641a7b77d774a2df085e9a8545a
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
TreeHugger Robot [Wed, 24 May 2017 19:00:56 +0000 (19:00 +0000)]
Merge "Reset mHiddenSetFromTransferredStartingWindow when app set visibility" into oc-dev
Felipe Leme [Wed, 24 May 2017 18:51:10 +0000 (11:51 -0700)]
Fixed assertions on bugreport share notification.
Fixes:
36698286
Test: mmm -j32 frameworks/base/packages/Shell && adb install -r -g ${OUT}/data/app/ShellTests/ShellTests.apk && adb shell am instrument -e class com.android.shell.BugreportReceiverTest$1 -w com.android.shell.tests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I0f3586309103a07afca5be3d1e3073d8a5dd04ec
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
Adrian Roos [Wed, 10 May 2017 22:48:01 +0000 (15:48 -0700)]
Keyguard: Update clock size
Bug:
38138115
Test: Observe that clock on lockscreen is smaller
Change-Id: I3360d2f234a47947321e05fb96253bbb808919a8
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: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)
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
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
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
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:36:23 +0000 (12:36 +0000)]
Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev
am:
7b7e7e1603
Change-Id: I3fe14c8bf7316b97135dc01286c329deb806824b
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: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: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
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:27:56 +0000 (08:27 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a am:
c1f0962ea7
am:
4b6cf3d841
Change-Id: I0a4e360b01bf336b26a3a8ccdee200198cdfcb90
Paul Duffin [Wed, 24 May 2017 08:19:09 +0000 (08:19 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a
am:
c1f0962ea7
Change-Id: I562bec1735557ed6718da4004fdd54e822f1e7f3
Michael Kwan [Wed, 24 May 2017 08:14:07 +0000 (08:14 +0000)]
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev
am:
93a2f19f5f
Change-Id: I6bdb4e9b41af9330405577fb18123720038530d0
Paul Duffin [Wed, 24 May 2017 08:11:37 +0000 (08:11 +0000)]
Merge "Fixed nfc-extras build files"
am:
d3ff45985a
Change-Id: I4786af397c556c72d1f7ac9ff7d762fa3efcf90b
TreeHugger Robot [Wed, 24 May 2017 08:07:29 +0000 (08:07 +0000)]
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev
Paul Duffin [Wed, 24 May 2017 08:01:36 +0000 (08:01 +0000)]
Merge "Fixed nfc-extras build files"
Hugo Benichi [Wed, 24 May 2017 07:15:09 +0000 (07:15 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621 am:
ca9fcb79f6
am:
ecf4267889
Change-Id: Ib4e100fc8219b58ab7850407735a444dad3ec153
Hugo Benichi [Wed, 24 May 2017 07:07:11 +0000 (07:07 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621
am:
ca9fcb79f6
Change-Id: Ia3f79fbcead21fdf4914b18905cd3b067ac7c806
Hugo Benichi [Wed, 24 May 2017 06:59:02 +0000 (06:59 +0000)]
Merge "Move NsdServiceTest to correct directory"
am:
0a76f99621
Change-Id: I37b614bec6dc4a9da55024c534dbfc9459e2764a
Treehugger Robot [Wed, 24 May 2017 06:47:29 +0000 (06:47 +0000)]
Merge "Move NsdServiceTest to correct directory"
Bill Yi [Wed, 24 May 2017 06:34:39 +0000 (23:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1398490744462a381ff3a1b49d5b2dcb1bfa49be
Auto-generated-cl: translation import
Hugo Benichi [Wed, 24 May 2017 05:16:55 +0000 (14:16 +0900)]
Move NsdServiceTest to correct directory
Test: no functional change
Bug:
62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
Bill Yi [Wed, 24 May 2017 04:43:45 +0000 (21:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0c1ec6484136daab3d72bf5b5277495b2834b25
Auto-generated-cl: translation import
Jaewan Kim [Wed, 24 May 2017 04:17:40 +0000 (04:17 +0000)]
Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev
am:
31f6a3dc8b
Change-Id: I234a22a713b355876abb4917a16a0971a8cb9689