From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Fri, 6 Apr 2018 20:19:21 +0000 (+0000)
Subject: Merge "Add name and icon for AOD" into pi-dev
X-Git-Tag: android-x86-9.0-r1~58^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9cea645e1;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add name and icon for AOD" into pi-dev
---

f9cea645e1444d6fd228659efc0198ed20650567