OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34bdee3 afa64f4)
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into...
authorJohn Spurlock <jspurlock@google.com>
Thu, 4 Jun 2015 16:04:13 +0000 (16:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Jun 2015 16:04:13 +0000 (16:04 +0000)
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
  Settings: Add zen rule name warning text.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help