OSDN Git Service

Merge changes Ie5b66d6c,Ia1004ca6 am: 78ccbf5596
authorAndreas Gampe <agampe@google.com>
Wed, 1 Nov 2017 00:31:24 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 00:31:24 +0000 (00:31 +0000)
commitb46bd8b737e49c83bde5dcbe7504c1c70732f42f
tree3e3c9c89d1c848a306d29d07ca173bf22d7072a3
parent547fd06a985ddb55a800f1c5d28965fde4b96555
parent1a2104d79eb2387a16c70af106ea7933cb18f29d
Merge changes Ie5b66d6c,Ia1004ca6 am: 78ccbf5596
am: 1a2104d79e  -s ours

Change-Id: I257bff453fd0a5e3ee544acfdfa38d4fb6492df2