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