tree 9db2f4e9a5922b152b41de65c157f9906e40f749
parent 0e3ee323188380006d9985d479cde99408c19b51
parent fd5f79e08c0b7afe4dcace976700219a31894dac
author Nick Kralevich <nnk@google.com> 1326321838 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1326321838 -0800

Merge "link to security faq page."