OSDN Git Service

Merge changes I49057737,I68e3096d am: 50cf621704 am: f5dcc28b0c
authorAndreas Gampe <agampe@google.com>
Thu, 31 Aug 2017 15:35:58 +0000 (15:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 15:35:58 +0000 (15:35 +0000)
am: 30348a8abb

Change-Id: I9755772ab8c8d4c3708ee2a65cda0b0d3f39d30e


Trivial merge