OSDN Git Service

am 36cb7fb8: am dae542a3: Fix error in settings key from refactor
authorAlan Newberger <alann@google.com>
Thu, 2 Oct 2014 00:36:10 +0000 (00:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Oct 2014 00:36:10 +0000 (00:36 +0000)
* commit '36cb7fb8b3f89a3759f0c30709eea36ac03ae8b7':
  Fix error in settings key from refactor


Trivial merge