Patrick Tjin 50a5d52857 resolve merge conflicts of 084b9ab to oc-mr1-dev ...

Bug: 64760618
Test: verified correct asset
Change-Id: I8d10c3b1a8418eea1ea0ffff959f1c2f61835570

2017-09-15 19:17:49 +00:00

..

frameworks/base

Increase the dim brightness.

2017-09-04 17:52:23 +01:00

packages/apps/Settings/res

Update regulatory info.

2017-09-15 09:31:19 -07:00