| commit | 8399d32daba686eba9906f8bbc1adc337579344b | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Tue Sep 22 00:20:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 00:20:09 2015 +0000 |
| tree | 55c160272a3ac83571c0dc54a5d9f4df1ea92451 | |
| parent | a9fda51c766d41d9bf128681bc0153e9f2ec7892 [diff] | |
| parent | d3d0347be045d63328558d13cba81d90a0247b44 [diff] |
am d3d0347b: 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 'd3d0347be045d63328558d13cba81d90a0247b44': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3