diff options
author | Zach Jang <zachjang@google.com> | 2015-09-21 21:30:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-21 21:30:27 +0000 |
commit | 937141cb75160a1a51b9568481225aec286c5a86 (patch) | |
tree | b794743ce81ef7ff81bd256d03d11db5210af11d | |
parent | e1a6299b994bbdb304550e00d5b3b26a064bdf0c (diff) | |
parent | 0cae8381666248e44875756e72998e55ed3f9151 (diff) | |
download | frameworks_base-937141cb75160a1a51b9568481225aec286c5a86.zip frameworks_base-937141cb75160a1a51b9568481225aec286c5a86.tar.gz frameworks_base-937141cb75160a1a51b9568481225aec286c5a86.tar.bz2 |
am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '0cae8381666248e44875756e72998e55ed3f9151':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
0 files changed, 0 insertions, 0 deletions