sidevans@sidevans-Inspiron-One-19A:~/aokp_jb/vendor/aokp$ git commit -m "fix merge conflicts"
Recorded resolution for 'products/AndroidProducts.mk'.
Recorded resolution for 'vendorsetup.sh'.
[detached HEAD f64bd8c] fix merge conflicts
 Author: dagr8 <ren.o.custom@gmail.com>
 93 files changed, 1199 insertions(+)
 create mode 100644 overlay/common/packages/apps/Camera/res/values-sw640dp-land/styles.xml
 create mode 100644 overlay/common/packages/apps/Camera/res/values-sw640dp-port/styles.xml
 create mode 100644 overlay/common/packages/inputmethods/LatinIME/java/res/values-land/config.xml
 create mode 100644 overlay/pa_hdpi/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 overlay/pa_hdpi/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_1_hybrid_off.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_2_stock.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_3.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_4.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_5.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_6.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_7.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/assets/presets/pref_8.xml
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_3.png
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_4.png
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_1.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_2.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_3.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_4.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_5.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_6.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_7.jpg
 create mode 100644 overlay/pa_hdpi/packages/apps/ParanoidWallpapers/res/drawable-nodpi/wallpaper_8.jpg
 create mode 100644 overlay/pa_large-mdpi/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 overlay/pa_large-mdpi/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_1_hybrid_off.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_2_stock.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_3.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_4.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_5.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_6.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_7.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_8.xml
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_3.png
 create mode 100644 overlay/pa_large-mdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_4.png
 create mode 100644 overlay/pa_mdpi/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_1_hybrid_off.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_2_stock.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_3.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_4.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_5.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_6.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_7.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/assets/presets/pref_8.xml
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/res/drawable-mdpi/pref_3.png
 create mode 100644 overlay/pa_mdpi/packages/apps/ParanoidPreferences/res/drawable-mdpi/pref_4.png
 create mode 100644 overlay/pa_tvdpi/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 overlay/pa_tvdpi/frameworks/base/packages/SystemUI/res/values/dimens.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_1_hybrid_off.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_2_stock.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_3.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_4.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_5.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_6.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_7.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/assets/presets/pref_8.xml
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_1_hybrid_off.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_2_stock.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_3.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_4.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_5.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-hdpi/pref_6.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_1_hybrid_off.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_2_stock.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_3.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_4.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_5.png
 create mode 100644 overlay/pa_tvdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_6.png
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_1_hybrid_off.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_2_stock.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_3.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_4.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_5.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_6.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_7.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/assets/presets/pref_8.xml
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_3.png
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_4.png
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_5.png
 create mode 100644 overlay/pa_xhdpi/packages/apps/ParanoidPreferences/res/drawable-xhdpi/pref_6.png
 create mode 100644 prebuilt/aokp_quincyatt.conf
 create mode 100644 prebuilt/pa_hdpi.conf
 create mode 100644 prebuilt/pa_large-mdpi.conf
 create mode 100644 prebuilt/pa_mdpi.conf
 create mode 100644 prebuilt/pa_tvdpi.conf
 create mode 100644 prebuilt/pa_xhdpi.conf
 create mode 100644 products/AndroidProducts.mk~
 create mode 100644 products/quincyatt.mk~
 create mode 100644 vendorsetup.sh~