tree ccd3fe93f76875ffd95e8be16067afa1a7f58a29
parent e42b999e164c6995358271f2128ed296871fb4a1
parent c1fa3e64b88ab81cf1faeaccb40cbc73e9f1f829
author Romain Guy <romainguy@google.com> 1335565799 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335565799 -0700

Merge "Add three new developer settings" into jb-dev