OSDN Git Service

Merge remote-tracking branch \'goog/master\' into mege
authorRoland Levillain <rpl@google.com>
Wed, 23 Mar 2016 17:30:59 +0000 (17:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 17:30:59 +0000 (17:30 +0000)
am: 748438e

* commit '748438ed62dbd130c2f52f2f0ede1ce75b6c28f0':


Trivial merge