tree f8dd13f683aac6e8485d1de0c8f6e7a3044b9fb6
parent 57ddcb1bbce7a980e677dfd212ce76229fe33f55
parent a3f11e6e66710a3626b6bdb1f9e910729fb87b6f
author Christopher Tate <ctate@google.com> 1349908500 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349908500 -0700

Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev