tree 6f39365d99652d743df43995626ff39053961bd8
parent 261ba6207398e7c91ab669f45083499fdc3d6434
parent af3cd21b08dd22d6ffd747c6314fd49fed3170a0
author Christopher Tate <ctate@google.com> 1349808388 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349808388 -0700

am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev

* commit 'af3cd21b08dd22d6ffd747c6314fd49fed3170a0':
  New command line tool: "settings"