Phil Weaver 37e0c1f3cc resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0 -s ours ...

am: d88b7364d8  -s ours

Change-Id: I81d6961428e04f5751a479525756fae14fe5a503

2017-08-31 18:18:44 +00:00

res

Misc icon updates am: 24dc1ab39e

2017-08-31 04:44:02 +00:00

src/com/android/settings

Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev am: 13991ff9f3

2017-08-31 05:10:20 +00:00

tests

Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa

2017-08-30 17:21:30 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e

2017-08-10 02:31:39 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

PREUPLOAD.cfg

…

proguard.flags

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%