Sundeep Ghuman 2fd9ad068a Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp ...

am: c8d5463923

Change-Id: Ia3e0d750ab8f7541700b2a99b3b10bea2b826565

2017-07-25 23:47:18 +00:00

..

res

Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04 am: f68823e51e

2017-07-25 00:18:22 +00:00

src/com/android/settingslib

Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp

2017-07-25 23:47:18 +00:00

tests

Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp

2017-07-25 23:47:18 +00:00

Android.mk

…

AndroidManifest.xml

…

common.mk

…