OSDN Git Service

Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am...
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 1 Aug 2017 14:23:20 +0000 (14:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 14:23:20 +0000 (14:23 +0000)
commit18a5474740bdd65ee2153eadf0f2144f78a69308
treea7d3e43097c9fa1ea6eec4dead7c655fc75012e6
parent5e6449b4f845b2105cf477c748e4cfc199042807
parentcf83f9dd125125e199a3aee8110c718e46ff8854
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
am: cf83f9dd12

Change-Id: I4ffacf5d6d372659e5d2d5d2a24322a8a58804b9