OSDN Git Service

Merge changes I7bd99fc0,I329bc929
authorCalin Juravle <calin@google.com>
Wed, 1 Nov 2017 22:20:06 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 22:20:06 +0000 (22:20 +0000)
commit71ae6b3aabcf0588069c79bedf4bf9d5dd2a7890
tree5fe4e1cfed804c2355d4a16972939bd04664c081
parent8952f058fff4571ab1a37fcc7a0ca51ebdf1be77
parentdeee2e12de5fee1df2185040fde2a608d0bdd8c7
Merge changes I7bd99fc0,I329bc929
am: deee2e12de

Change-Id: I52905bf3d6971332b216c8b5f18a695a4bbd23c5