OSDN Git Service

am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Fri, 14 Sep 2012 21:13:58 +0000 (14:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Sep 2012 21:13:58 +0000 (14:13 -0700)
commit38f531c5746ec431c030e999b2ff922130abac76
tree2f72ed18f3d761f9a312e38fbbcd1a79eea4c8e3
parent0322512b7f631f00cf7ec9c410a3a0f93dbdba9b
parentbc7f678cc9334ef9d45a220fd0ef2db9c31019dc
am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev

* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
  Fix crash in Settings > Security