tree 0c9022093088ecae8609fe29a5681ad770b8eb08
parent 291a8de41c90bdab795199669f0fa12adf5854c9
parent b7fa33432f5faaed34275e2abc822675c4f883a2
author Jay Shrauner <shrauner@google.com> 1437001959 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437001959 +0000

am b7fa3343: am 63443bec: am 5856975d: Change Settings name

* commit 'b7fa33432f5faaed34275e2abc822675c4f883a2':
  Change Settings name