OSDN Git Service

Merge changes If5025361,Iabe27cd8
authorPeter Qiu <zqiu@google.com>
Thu, 26 Jan 2017 22:53:13 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 22:53:13 +0000 (22:53 +0000)
am: 0a649bffcc

Change-Id: Ia66d523ed565704178315d66bd19ffe02cbb7560


Trivial merge