| commit | 19306cb4eab507e157650cdbda78607b81f82e92 | [log] [tgz] |
|---|---|---|
| author | Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> | Mon Oct 23 22:26:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 23 22:26:49 2017 +0000 |
| tree | 69a6c2d5824dae556f56b65b2f733212556042ca | |
| parent | 380746a5403d32bcb5a46b33edaababdd297df2e [diff] | |
| parent | 568b77fff2f51a6815cd248d86972c43e1d02384 [diff] |
Merge "Keep screen on during detecting some NFC devices" am: 568b77fff2 Change-Id: Ided3b8298ccf7665605652f262be8954e213bf4e