| commit | 4925e6234f522ee7d3c2b20ed9617df0759c0ae0 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:52:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:52:32 2015 +0000 |
| tree | 0b8e7139e0cb5eaf5b6dcc2493aebea2a17b494b | |
| parent | b9aaf9b2717f714b218f273bc95bf5b6edf76b74 [diff] | |
| parent | 0ac53af01a8c644925f9d30596de7a36ec5ef5b8 [diff] |
am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '0ac53af01a8c644925f9d30596de7a36ec5ef5b8': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3