OSDN Git Service

Merge "Fix crash in Settings > Security" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Fri, 14 Sep 2012 21:12:14 +0000 (14:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Sep 2012 21:12:14 +0000 (14:12 -0700)

Trivial merge