tree ae5c73cf98a46509cadcbbae409b95c4fe096c1a
parent 5b36696e4280db82808a190dcd22cc1789ab991a
parent 63443bec54f01d0bca0d66f57ca5dd0e7fc42440
author Jay Shrauner <shrauner@google.com> 1437001069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437001069 +0000

am 63443bec: am 5856975d: Change Settings name

* commit '63443bec54f01d0bca0d66f57ca5dd0e7fc42440':
  Change Settings name