OSDN Git Service

am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout
authorAdrian Roos <roosa@google.com>
Tue, 22 Jul 2014 13:56:36 +0000 (13:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jul 2014 13:56:36 +0000 (13:56 +0000)
* commit '4c177cbd18136b3c60a1fe531f2d3d2cc5e5de26':
  Fix and simplify advanced security settings layout


Trivial merge