OSDN Git Service

Merge changes Id4feeefa,Ie0a501b8 into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 18 May 2018 23:08:19 +0000 (23:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 May 2018 23:08:19 +0000 (23:08 +0000)
commit45a250a2be6deceeebb74d25c98d984b173b4db4
treed4c57588d9175e13a78d957538e5beedec581929
parenta7eba8d41257fee8467150fdced9a9a89805c151
parent38fcfd050010aad8a98f63694194eb3df053d41e
Merge changes Id4feeefa,Ie0a501b8 into pi-dev

* changes:
  Add counter for predictive info for hush gesture
  Update DND strings
core/java/android/provider/Settings.java