OSDN Git Service

Merge "Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b686...
authorSanket Padawe <sanketpadawe@google.com>
Fri, 3 Jun 2016 00:34:02 +0000 (00:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Jun 2016 00:34:03 +0000 (00:34 +0000)

Trivial merge