OSDN Git Service

am 9fa19a2e: (-s ours) am f993f137: Merge "service: Fix permissions/properties argume...
authorIan Coolidge <icoolidge@google.com>
Thu, 27 Aug 2015 10:55:30 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:30 +0000 (10:55 +0000)
* commit '9fa19a2e3e3cfa0635eeebd4983fbd265968deb4':


Trivial merge