PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev

Browse Source 
am: a504291eef

Change-Id: Ia3de4132ddd615ee5f148d1871f170cb36023eda
This commit is contained in:
Matthew Fritze
2017-08-01 00:35:20 +00:00
committed by android-build-merger
parent 7907bd215d a504291eef
commit 44a17e6c51
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/search/ResultPayload.java
View File

@@ -1,4 +1,4 @@
/* l/*
* Copyright (C) 2017 The Android Open Source Project * Copyright (C) 2017 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");