OSDN Git Service
Daniel Nishi [Mon, 8 May 2017 16:50:17 +0000 (16:50 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
am:
816956d249
Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
Daniel Nishi [Mon, 8 May 2017 16:45:06 +0000 (16:45 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
nharold [Sat, 6 May 2017 02:55:47 +0000 (02:55 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1 am:
98f209c6e5
am:
2e4950879a
Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
Fan Zhang [Sat, 6 May 2017 02:46:38 +0000 (02:46 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am:
4f5b13f97a
Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
TreeHugger Robot [Sat, 6 May 2017 02:42:37 +0000 (02:42 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
nharold [Sat, 6 May 2017 02:07:30 +0000 (02:07 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1
am:
98f209c6e5
Change-Id: I5c7760471d2e48df20955122507b503ca546954e
nharold [Sat, 6 May 2017 01:57:56 +0000 (01:57 +0000)]
Merge "Update references to use PhoneConstantConversion"
am:
79694e79d1
Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge "Update references to use PhoneConstantConversion"
Roozbeh Pournader [Sat, 6 May 2017 01:39:29 +0000 (01:39 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am:
869d246021
Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
TreeHugger Robot [Sat, 6 May 2017 01:34:46 +0000 (01:34 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
Fan Zhang [Fri, 5 May 2017 22:03:19 +0000 (15:03 -0700)]
Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.
Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix:
37945069
Test: make RunSettingsRoboTests
Doris Ling [Sat, 6 May 2017 00:02:54 +0000 (00:02 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am:
f9d9524574
Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
TreeHugger Robot [Fri, 5 May 2017 23:59:27 +0000 (23:59 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
Fan Zhang [Fri, 5 May 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
am:
fe5d64feb0
Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
Doris Ling [Wed, 3 May 2017 23:22:40 +0000 (16:22 -0700)]
Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.
Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix:
37409266
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 21:52:06 +0000 (21:52 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
Suprabh Shukla [Fri, 5 May 2017 20:56:10 +0000 (20:56 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am:
43083b4332
Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
TreeHugger Robot [Fri, 5 May 2017 20:48:41 +0000 (20:48 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
Roozbeh Pournader [Fri, 5 May 2017 20:40:05 +0000 (13:40 -0700)]
Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.
Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.
Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes:
37761152
Fan Zhang [Thu, 4 May 2017 16:12:12 +0000 (09:12 -0700)]
Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix:
37934871
Test: make RunSettingsRoboTests
jackqdyulei [Fri, 5 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
am:
651261c7dd
Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
TreeHugger Robot [Fri, 5 May 2017 18:55:27 +0000 (18:55 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
jackqdyulei [Thu, 4 May 2017 19:38:08 +0000 (12:38 -0700)]
Only use PROCESS_STATE_TOP as foreground time.
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.
We will fix it after O and may add them back later.
Bug:
37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
Bill Yi [Fri, 5 May 2017 12:08:31 +0000 (12:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2dcbda8004 -s ours
Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
TreeHugger Robot [Fri, 5 May 2017 11:58:05 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 5 May 2017 06:26:52 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
Dan Sandler [Fri, 5 May 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
am:
1bba60cf0e
Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
TreeHugger Robot [Fri, 5 May 2017 02:21:10 +0000 (02:21 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
Suprabh Shukla [Wed, 3 May 2017 01:06:16 +0000 (18:06 -0700)]
Adding SecureTouchListener to DeviceAdminAdd
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window
Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test
Bug:
35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
Ajay Panicker [Thu, 4 May 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
am:
b72a8b5ab3 -s ours
Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
Daniel Nishi [Wed, 3 May 2017 20:36:36 +0000 (13:36 -0700)]
Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.
Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes:
37945253
Test: Robotest
Julia Reynolds [Thu, 4 May 2017 20:15:12 +0000 (20:15 +0000)]
Merge "Only show one copy of each preference" into oc-dev
am:
31de48193e
Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
Julia Reynolds [Thu, 4 May 2017 20:08:38 +0000 (20:08 +0000)]
Merge "Only show one copy of each preference" into oc-dev
Daniel Nishi [Thu, 4 May 2017 17:30:41 +0000 (17:30 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
am:
408fd90102
Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
Esteban Talavera [Thu, 4 May 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
am:
607b4d0573
Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
Daniel Nishi [Thu, 4 May 2017 17:18:35 +0000 (17:18 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
Fan Zhang [Thu, 4 May 2017 16:17:46 +0000 (16:17 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
am:
e4eb65c00e
Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
Fan Zhang [Thu, 4 May 2017 16:12:25 +0000 (16:12 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
Julia Reynolds [Thu, 4 May 2017 14:10:22 +0000 (10:10 -0400)]
Only show one copy of each preference
Fixes:
37912144
Fixes:
37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.
Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
Esteban Talavera [Wed, 5 Apr 2017 15:31:10 +0000 (16:31 +0100)]
Show when work profile notifications are blocked for listener
Bug:
36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit
ee349792dd4d34bbbdc10446c88ce5f370d5347c)
Fan Zhang [Thu, 4 May 2017 02:28:22 +0000 (02:28 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
am:
efed517a8a
Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f
TreeHugger Robot [Thu, 4 May 2017 02:23:17 +0000 (02:23 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
Lorenzo Colitti [Thu, 4 May 2017 02:12:20 +0000 (02:12 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
am:
33b0104cfc
Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a
Lorenzo Colitti [Thu, 4 May 2017 02:06:48 +0000 (02:06 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
jackqdyulei [Thu, 4 May 2017 01:16:08 +0000 (01:16 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev
am:
3a1d6db0e7
Change-Id: I2c9b8a4c1d80911467d51ee883fb0a9a8bd01b43
Glen Kuhne [Thu, 4 May 2017 01:15:47 +0000 (01:15 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev
am:
eb6eb99a56
Change-Id: Id7fa8980306e02e5b441278b76f01d9343119ecf
TreeHugger Robot [Thu, 4 May 2017 01:11:23 +0000 (01:11 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:04:49 +0000 (01:04 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev
Daniel Nishi [Wed, 3 May 2017 21:14:56 +0000 (14:14 -0700)]
Fix a bug where override filter was always on.
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes:
37952170
Test: Settings unit test
Fan Zhang [Thu, 4 May 2017 00:03:55 +0000 (17:03 -0700)]
Fix string where it says "phone" on a tablet.
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix:
37833383
Test: visual
Jeremy Joslin [Wed, 3 May 2017 23:05:59 +0000 (23:05 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
am:
b8eb78b321
Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
Glen Kuhne [Tue, 2 May 2017 19:11:28 +0000 (12:11 -0700)]
Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.
Bug:
37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
jackqdyulei [Wed, 3 May 2017 18:23:33 +0000 (11:23 -0700)]
Update "Phone idle" subtext
Bug:
37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
Fan Zhang [Wed, 3 May 2017 17:26:23 +0000 (10:26 -0700)]
Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.
Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix:
37933524
Test: robotests
Daniel Nishi [Wed, 3 May 2017 18:04:51 +0000 (18:04 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev
am:
833927929e
Change-Id: I569b89bcf10fa32f86978c80fb646c0d4503b89e
Daniel Nishi [Wed, 3 May 2017 18:04:17 +0000 (18:04 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev
am:
0c58fbd345
Change-Id: I4dbc750366d9fdbd6bc18abd751e47694de1d368
Daniel Nishi [Wed, 3 May 2017 18:00:18 +0000 (18:00 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev
Daniel Nishi [Wed, 3 May 2017 17:59:06 +0000 (17:59 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev
Dan Sandler [Tue, 2 May 2017 00:14:40 +0000 (20:14 -0400)]
Defend against underspecified notifications.
While we're here, show the channelId and other O features of
notifications in the extra text.
(Also make a halfhearted attempt to keep an expanded
notification open while other notifications are updating.)
Bug:
37646836
Test: none
Change-Id: I1b34ae9aaeb0af1e9f993354cebef8644050bed2
Lorenzo Colitti [Wed, 26 Apr 2017 15:56:39 +0000 (00:56 +0900)]
Add a "sign into network" button to the wifi details page.
Bug:
36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
jackqdyulei [Wed, 3 May 2017 02:24:48 +0000 (02:24 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
am:
4b50e58a1d
Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
TreeHugger Robot [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
Daniel Nishi [Mon, 1 May 2017 18:30:14 +0000 (11:30 -0700)]
Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.
This fixes this by double-checking the Files visibility status whenever
we set the volume.
Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes:
37790776
Test: Settings robotest
jackqdyulei [Tue, 2 May 2017 22:16:19 +0000 (15:16 -0700)]
Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.
Bug:
37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
Nathan Harold [Tue, 20 Dec 2016 01:50:34 +0000 (17:50 -0800)]
Update references to use PhoneConstantConversion
Bug:
33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
Matthew Fritze [Tue, 2 May 2017 19:29:18 +0000 (19:29 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
am:
d51b94b042
Change-Id: I2b915166c5a52082bfb0c4dff52ea9101f5c2514
TreeHugger Robot [Tue, 2 May 2017 19:25:52 +0000 (19:25 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
Miao Miao (苗苗) [Tue, 2 May 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b am:
c6e3467cc2
am:
b1480c8cab
Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
Miao Miao (苗苗) [Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b
am:
c6e3467cc2
Change-Id: If6ad081e117a94df84d041776649af63c392cc30
Miao Miao (苗苗) [Tue, 2 May 2017 17:44:08 +0000 (17:44 +0000)]
Merge "Settings crash when receiving data state broadcast"
am:
2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
Matthew Fritze [Mon, 24 Apr 2017 23:32:52 +0000 (16:32 -0700)]
Prevent empty non-Indexable keys from being added
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes:
37646265
Test: make RunSettingsRoboTests
Treehugger Robot [Tue, 2 May 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Settings crash when receiving data state broadcast"
Kevin Chyn [Tue, 2 May 2017 17:16:09 +0000 (17:16 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
am:
f1f35ee107
Change-Id: I105ef25110a9c7b158c08f61f5e0b4354490218e
TreeHugger Robot [Tue, 2 May 2017 17:12:20 +0000 (17:12 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:07:02 +0000 (17:07 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
am:
a41a190ac3
Change-Id: I967f4fd28c5375f0c56ad88dedc47a484918b629
Daniel Nishi [Tue, 2 May 2017 17:06:36 +0000 (17:06 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
am:
b4937f4556
Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
Daniel Nishi [Tue, 2 May 2017 17:03:36 +0000 (17:03 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:12 +0000 (17:03 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
Jeremy Joslin [Fri, 28 Apr 2017 23:40:51 +0000 (16:40 -0700)]
Allow "None" to be selected as a Network rating provider.
Updated the picker to always provide "None" as an option. The
preference is only disabled if there a no valid scorers installed.
Existing tests updated and new tests added.
Bug:
37722313
Test: make RunSettingsRoboTests -j40
Test: manual on device clicking.
Change-Id: Ie6fd9f29e0ea3c64845dd98ce1d117013f50c86b
The Android Open Source Project [Tue, 2 May 2017 15:59:49 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
23550fdcd3 -s ours
Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8
TreeHugger Robot [Tue, 2 May 2017 15:46:54 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 09:06:19 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
Kevin Chyn [Tue, 2 May 2017 04:23:31 +0000 (04:23 +0000)]
Revert "Swipe for notification should be default-on in settings app"
This reverts commit
a95c2c3a8d65d191260d4948a54eee1c74dac3fa.
Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
Kevin Chyn [Tue, 2 May 2017 04:14:47 +0000 (04:14 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
am:
9ab1318ca8
Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
TreeHugger Robot [Tue, 2 May 2017 04:09:30 +0000 (04:09 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
Fan Zhang [Tue, 2 May 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
am:
74327fa4f0
Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd
TreeHugger Robot [Tue, 2 May 2017 02:23:34 +0000 (02:23 +0000)]
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
Amit Mahajan [Tue, 2 May 2017 02:07:38 +0000 (02:07 +0000)]
Merge "Change to not call update() if APN is not modified." into oc-dev
am:
7cab6a9a17
Change-Id: I7ae69ec7797f10e0d48a4ce7d1b3a80c18851911
TreeHugger Robot [Tue, 2 May 2017 01:59:37 +0000 (01:59 +0000)]
Merge "Change to not call update() if APN is not modified." into oc-dev
Jaekyun Seok [Tue, 2 May 2017 01:15:01 +0000 (01:15 +0000)]
Merge "Do not show static overlays as a theme" into oc-dev
am:
170acdb79b
Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa
TreeHugger Robot [Tue, 2 May 2017 01:03:53 +0000 (01:03 +0000)]
Merge "Do not show static overlays as a theme" into oc-dev
Jesse Evans [Tue, 2 May 2017 00:34:02 +0000 (00:34 +0000)]
Merge "Hides app buttons for instant apps" into oc-dev
am:
965508fc3e
Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
TreeHugger Robot [Tue, 2 May 2017 00:28:59 +0000 (00:28 +0000)]
Merge "Hides app buttons for instant apps" into oc-dev
Jaekyun Seok [Mon, 1 May 2017 23:21:06 +0000 (23:21 +0000)]
Merge "Generate license html file from xml files of partitions" am:
04a7e0a73a am:
f8aaf9ecdc
am:
8b5389f707
Change-Id: Id42eb0a0ea330c5758e4a77a31158b7dd26256b5
Jaekyun Seok [Mon, 1 May 2017 23:17:29 +0000 (23:17 +0000)]
Merge "Generate license html file from xml files of partitions" am:
04a7e0a73a
am:
f8aaf9ecdc
Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
Jaekyun Seok [Mon, 1 May 2017 23:15:34 +0000 (23:15 +0000)]
Merge "Generate license html file from xml files of partitions"
am:
04a7e0a73a
Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
Treehugger Robot [Mon, 1 May 2017 23:08:17 +0000 (23:08 +0000)]
Merge "Generate license html file from xml files of partitions"
OSDN Git Service
