| commit | a9fda51c766d41d9bf128681bc0153e9f2ec7892 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Tue Sep 22 00:20:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 00:20:08 2015 +0000 |
| tree | 55c160272a3ac83571c0dc54a5d9f4df1ea92451 | |
| parent | aa3d37a1d704ab9204de7d76dca784c9b17bd2ee [diff] | |
| parent | 3a5be13442f411153f2c3a2d0f50e1ed7c415f47 [diff] |
am 3a5be134: am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev * commit '3a5be13442f411153f2c3a2d0f50e1ed7c415f47': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3