commit | bc84b89a1589ce8905e41121534df92473cd931f | [log] [tgz] |
---|---|---|
author | Philip P. Moltmann <moltmann@google.com> | Fri Mar 18 14:26:01 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 18 14:26:03 2016 +0000 |
tree | 43fe96dc540ca6ee8eb8c96d411a591f6bed3036 | |
parent | 5849f20124181f35063902829fdfc4c926b4424f [diff] | |
parent | f0847871eaf5cdcf697f07f013efee3d84d836f2 [diff] |
Merge "If services are enabled, services might become enabled in the future" into nyc-dev