| commit | a5842d3e17f2d619f5de7bfae85f58ff9642dae4 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 23:57:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 23:57:04 2015 +0000 |
| tree | 3110964e1210105dfb31b836787060a9d2843a48 | |
| parent | 2ad5c0cca46b7f0a159dbc90243756c84a93b093 [diff] | |
| parent | f694d378955ddac3ee2651080bfa00c5ae39dddc [diff] |
am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev * commit 'f694d378955ddac3ee2651080bfa00c5ae39dddc': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3