tree ca7e7ae4634e4163694b1bbc623d45eeacb8b733
parent ceb4d418464d1b72c450c5e390b1cc7b1f92a49f
parent 84f00277b11a0324f0dd08054b119f2a61f1e646
author Robert Ly <robertly@google.com> 1407946669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407946669 +0000

am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs

* commit '84f00277b11a0324f0dd08054b119f2a61f1e646':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5