OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c3d64c
f84c05c
)
Merge \"Pre-setup restrictions\" into nyc-dev
author
Jason Monk
<jmonk@google.com>
Tue, 19 Jul 2016 20:37:15 +0000
(20:37 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 19 Jul 2016 20:37:15 +0000
(20:37 +0000)
am:
f84c05c360
Change-Id: I2902c765eeacdbe05a393b01936572233c783988
1
2
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
index
5791168
,
83a2123
..
21116b8
---
1
/
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
---
2
/
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
+++ b/
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
@@@
-24,8
-24,8
+24,9
@@@
import android.content.Intent
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources.Theme;
+import android.content.res.TypedArray;
import android.net.Uri;
+ import android.provider.Settings.Global;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
diff --cc
packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
Simple merge
OSDN Git Service
