OSDN Git Service

am 871fedc1: (-s ours) am ff67e2a6: am 3a46bed6: am 88f9b3e7: Reduce logging of flatt...
authorSeth Raphael <magicseth@google.com>
Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)
* commit '871fedc18a1e5db6c32ea3c7fa3ed105ae032e89':
  Reduce logging of flattened Preferences


Trivial merge