OSDN Git Service

am b1e5a9ae: am 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev
authorJohn Reck <jreck@google.com>
Thu, 14 May 2015 23:49:11 +0000 (23:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 23:49:11 +0000 (23:49 +0000)
* commit 'b1e5a9aef72788d3b0408782f5d7e6adcdcdbefa':
  Check for setting to already set


Trivial merge