OSDN Git Service

Merge changes I7bd99fc0,I329bc929 am: deee2e12de am: 71ae6b3aab -s ours
authorCalin Juravle <calin@google.com>
Wed, 1 Nov 2017 22:42:56 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 22:42:56 +0000 (22:42 +0000)
commit34961873947d64896cd392af81b57ffa393f7175
tree5301743edb949fe971020d6f99ec941752888794
parent80f05cee869995286acf7230f1733c7fbc12f308
parentad0cc34ddd3d11c88126010b1e05e31387e657ec
Merge changes I7bd99fc0,I329bc929 am: deee2e12de am: 71ae6b3aab  -s ours
am: ad0cc34ddd  -s ours

Change-Id: I2a017d5eb99446d9834a3941f67d2d2fd234fe30