| commit | a8f9719abfe8678e4d9b7a3aa5dd20a990090f3e | [log] [tgz] |
|---|---|---|
| author | John Eckerdal <john.eckerdal@sonymobile.com> | Sat Jun 04 00:47:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 04 00:47:01 2016 +0000 |
| tree | 3dfe0c10bf49d811f22ba2b9fa62951df4938aa1 | |
| parent | e93d46675d154a85b5aea7c04b925794816ad143 [diff] | |
| parent | a67fdddf8ded4656f89e87a3170e52eaa01d24bc [diff] |
Merge "Stop the recurring alarm if no scansettings are available am: 0d0a4c339b am: d674b0c2bf" into nyc-mr1-dev-plus-aosp am: a67fdddf8d * commit 'a67fdddf8ded4656f89e87a3170e52eaa01d24bc': Change-Id: I514336e3a3086613ce2c954687965613d931db8a