OSDN Git Service

Merge changes Idca52b94,I82ae308d into pi-dev
authorDavid Brazdil <dbrazdil@google.com>
Fri, 6 Apr 2018 18:03:25 +0000 (11:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 18:03:25 +0000 (11:03 -0700)
commit20c37dd6c7904c10cda9b5d4ebc742829e582b88
tree5eb74831d866cac170a2efdbcb8630c7d4ff109f
parent954de018161bd01d1397dba990a4982598f8ae25
parentbb96c13c7027f187d08746470434e81387edaa36
Merge changes Idca52b94,I82ae308d into pi-dev
am: bb96c13c70

Change-Id: Ie83ef01646ededb9eab85c6418061aa64b4c1ed3