commit | b161297d4be7de24f832a4aa7329a7278a41bec5 | [log] [tgz] |
---|---|---|
author | Zach Jang <zachjang@google.com> | Mon Sep 21 19:05:33 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:05:33 2015 +0000 |
tree | 885ba5cf76fb3ed126483f67ee3f957a0ce5f702 | |
parent | 2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6 [diff] | |
parent | ab095b445af361911df2856e77f43c4cf103a0e2 [diff] |
am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 * commit 'ab095b445af361911df2856e77f43c4cf103a0e2': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3