tree 7aa1ce39b517991db26398c62bc30253aca0f19f
parent b4508e6d2ff45b174e43bc88c5119045e494eaf4
parent 76976f7ec5612bf3a725ff30b872bc431ba18243
author Adrian Ludwig <aludwig@google.com> 1321417170 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321417170 -0800

am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0

* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.