| commit | 306026329fa055532d1cdf2840af98fb1705de9b | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 22:02:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:02:09 2015 +0000 |
| tree | e57fd7e575b7968f7ebb0b0c6c4d524996a66e63 | |
| parent | 52fe489f24c67628fbe9c1995f765309f7043cef [diff] | |
| parent | 4925e6234f522ee7d3c2b20ed9617df0759c0ae0 [diff] |
am 4925e623: 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 '4925e6234f522ee7d3c2b20ed9617df0759c0ae0': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3