OSDN Git Service

am d8815b8f: am 966e276f: (-s ours) am 50184147: Merge "Resource for setting default...
authorMartijn Coenen <maco@google.com>
Thu, 27 Aug 2015 18:48:09 +0000 (18:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:48:09 +0000 (18:48 +0000)
* commit 'd8815b8f89593f265226034bcc394dafd25d54a6':


Trivial merge