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)
commitbc7f678cc9334ef9d45a220fd0ef2db9c31019dc
tree2f72ed18f3d761f9a312e38fbbcd1a79eea4c8e3
parent767597b28aebf46e42f7ce194acc09454d8d2324
parentce72ec79218e312e30ee0cb3045848c4e6d6ae5a
Merge "Fix crash in Settings > Security" into jb-mr1-dev