OSDN Git Service

am b0fd6bf0: (-s ours) am a9f07ccf: Merge "Fix line slop issue at end of line for...
authorMady Mellor <madym@google.com>
Thu, 27 Aug 2015 07:10:25 +0000 (07:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:10:25 +0000 (07:10 +0000)
* commit 'b0fd6bf0d98a87af5dfb7def76c32b5d938dd247':


Trivial merge