OSDN Git Service

Merge "Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8"
authorJerry Zhang <zhangjerry@google.com>
Thu, 17 Nov 2016 18:30:13 +0000 (18:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Nov 2016 18:30:16 +0000 (18:30 +0000)

Trivial merge