OSDN Git Service

Merge changes I3b56e75d,I36255a2c
authorErik Kline <ek@google.com>
Fri, 20 Oct 2017 02:45:14 +0000 (02:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 02:45:14 +0000 (02:45 +0000)
commit464d7635b0b3cb1adf1aba18aca99045df3eb215
tree0ea54dc1a69807e6123ce876dca0894c7758299f
parent4b4b7592725695bf74d075459ef14199f06dbbdd
parent5c7128c070146046d85feb003bca94cb8649f09c
Merge changes I3b56e75d,I36255a2c
am: 5c7128c070

Change-Id: I8ab4bfa6a069d24b89a6595dbc9ffd5d6dd816ec