OSDN Git Service

Merge "Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 9 Jan 2017 23:18:20 +0000 (23:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Jan 2017 23:18:24 +0000 (23:18 +0000)

Trivial merge