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