OSDN Git Service

am c4231382: DO NOT MERGE Settings: Implement new required method.
authorJohn Spurlock <jspurlock@google.com>
Fri, 28 Mar 2014 19:01:12 +0000 (19:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Mar 2014 19:01:12 +0000 (19:01 +0000)
* commit 'c423138247857312a4ac6ad32cb482868315bd61':
  DO NOT MERGE Settings: Implement new required method.


Trivial merge