| commit | a67fdddf8ded4656f89e87a3170e52eaa01d24bc | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Jun 04 00:46:43 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jun 04 00:46:43 2016 +0000 |
| tree | 6c11008b40ade275e80178f957b495bc7b8584aa | |
| parent | 6485025ee6bdf01fb2add32ebd51e09da7405d75 [diff] | |
| parent | 6c4d4d23b622ebf73d27fa5a95708d872e9c747b [diff] |
Merge "Stop the recurring alarm if no scansettings are available am: 0d0a4c339b am: d674b0c2bf" into nyc-mr1-dev-plus-aosp