tree 5f02faaedd79597056cfc9cdc6b4c9473953a720
parent 63222c6fcc638b3be36751c6997452cb244d2bdf
parent 2ad812d4aa82cb18e6cd650497acaa7a3f394df9
author Nick Kralevich <nnk@google.com> 1364429691 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364429692 +0000

Merge "Initial checkin: optional permissions sample code" into jb-mr2-dev