OSDN Git Service

Merge changes I5187d17c,I49a76582
authorHugo Benichi <hugobenichi@google.com>
Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)
commitf2e5cf715de23c6d7a172ffcb2b969bfb45e89fa
tree60bf62c7280a857e5c119b18d69dafde25bdeff1
parent40ab8401b291de49e4aa1b6806f912212c8c6eb5
parent7781a6d4c138dab056459d9e3dfc017a763b70d0
Merge changes I5187d17c,I49a76582
am: 7781a6d4c1

Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f