| commit | d3d0347be045d63328558d13cba81d90a0247b44 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Tue Sep 22 00:13:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 00:13:22 2015 +0000 |
| tree | 55c160272a3ac83571c0dc54a5d9f4df1ea92451 | |
| parent | 3a5be13442f411153f2c3a2d0f50e1ed7c415f47 [diff] | |
| parent | 6a0bdb551810df79a3561ebe4f1cfcde8583659b [diff] |
am 6a0bdb55: am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 * commit '6a0bdb551810df79a3561ebe4f1cfcde8583659b': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3