diff options
| author | Patrick Tjin <pattjin@google.com> | 2017-09-15 12:16:11 -0700 |
|---|---|---|
| committer | Pat Tjin <pattjin@google.com> | 2017-09-15 19:17:49 +0000 |
| commit | 50a5d528576fd3492919914e0e468d50890684f6 (patch) | |
| tree | f479c0f6e7cd6221f90dea4b623767b52228ea49 | |
| parent | 6e05ad6c8547975c77b64357b4efd274f8583022 (diff) | |
| parent | 084b9ab09a970bfcc8b51effa0a00793d0b9529c (diff) | |
| download | device_google_taimen-50a5d528576fd3492919914e0e468d50890684f6.tar.gz device_google_taimen-50a5d528576fd3492919914e0e468d50890684f6.tar.bz2 device_google_taimen-50a5d528576fd3492919914e0e468d50890684f6.zip | |
resolve merge conflicts of 084b9ab to oc-mr1-dev
Bug: 64760618
Test: verified correct asset
Change-Id: I8d10c3b1a8418eea1ea0ffff959f1c2f61835570
| -rw-r--r-- | overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png | bin | 236557 -> 235681 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png b/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png Binary files differindex 45e837d..2e6abc6 100644 --- a/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png +++ b/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png |
