OSDN Git Service

Merge "Merge commit '15a5a06e7ce0ad04ea49ad7bb5226d5e98560145' into merge"
authorEtan Cohen <etancohen@google.com>
Thu, 2 Apr 2015 03:07:28 +0000 (03:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Apr 2015 03:08:54 +0000 (03:08 +0000)

Trivial merge