OSDN Git Service

Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Thu, 23 Aug 2012 01:45:51 +0000 (18:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Aug 2012 01:45:52 +0000 (18:45 -0700)

Trivial merge