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

resolve merge conflicts of 7f7092c to nyc-mr1-dev

Browse Source 
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
This commit is contained in:
Jason Monk
2016-06-08 16:19:35 -04:00
parent d4e31320c1 7f7092c705
commit aaaa236cec
25 changed files with 293 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/icc_lock_tabs.xml
View File

@@ -47,7 +47,7 @@
android:layout_height="0dip" />
<FrameLayout
android:id="@+id/main_content"
android:id="@+id/prefs_container"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"