| commit | 0ac53af01a8c644925f9d30596de7a36ec5ef5b8 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:44:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:44:48 2015 +0000 |
| tree | cc8d775bc4384916dcf094e2a74ee3e1ba1521c5 | |
| parent | fdb277f08176de59246664396d164cd95d2c6878 [diff] | |
| parent | 825518b7b996d5d8df84f801b3d1725e786f132f [diff] |
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 '825518b7b996d5d8df84f801b3d1725e786f132f': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3