diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 15:45:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 15:45:55 +0000 |
| commit | 8f72b4037022c4f860caafa296e2ac309bde177f (patch) | |
| tree | 70623eabd54a22cde23cc00ea3a21851e8b764f2 /services/core/java/com/android/server/pm/Settings.java | |
| parent | 1b12db9e6225171da87ed9586daeabf76b53c05a (diff) | |
| parent | d60258f2d33214077a22c1a682944fa9e47c0461 (diff) | |
| download | frameworks_base-8f72b4037022c4f860caafa296e2ac309bde177f.zip frameworks_base-8f72b4037022c4f860caafa296e2ac309bde177f.tar.gz frameworks_base-8f72b4037022c4f860caafa296e2ac309bde177f.tar.bz2 | |
Merge "Zen: New event condition data model." into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/pm/Settings.java')
0 files changed, 0 insertions, 0 deletions