OSDN Git Service

Merge changes I49057737,I68e3096d
authorAndreas Gampe <agampe@google.com>
Thu, 31 Aug 2017 15:15:31 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 15:15:31 +0000 (15:15 +0000)
commitf5dcc28b0cdd671116ed80f324e4d1090f67abbe
tree5c15e829504086484b7137dd50cb2ef2c7be50b7
parent4c1b0ae343f351143081cbeecb6217328f3907b0
parent50cf62170464649a04a9747b1558ef912feaa2eb
Merge changes I49057737,I68e3096d
am: 50cf621704

Change-Id: Id66d91bc326461dc3cae4cbae03f3d060761ea7f