resolve merge conflicts of 084b9ab to oc-mr1-dev

Browse Source

am: 50a5d52857

Change-Id: Ibf715df4528998894a827f37695974252ebd6a08

...

This commit is contained in:

Patrick Tjin

2017-09-15 21:20:51 +00:00

committed by android-build-merger

parent 2431d401bb 50a5d52857

commit eb12121953

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 231 KiB After Width:  |  Height:  |  Size: 230 KiB