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

resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
This commit is contained in:
Jason Monk
2016-06-08 15:28:48 -04:00
parent 9667149282 167f6cc87c
commit 84f544a2ae
23 changed files with 282 additions and 277 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"