| commit | b2b3cecbd3de80d40f8c207c6aa94532c3426829 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:44:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:44:41 2015 +0000 |
| tree | 98c95802cfa0eae5ae90ceb0e04abfb3ce862788 | |
| parent | 0a8197b1e43bc3771fc3f8595619603ec8f6f641 [diff] | |
| parent | 7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb [diff] |
am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings