OSDN Git Service

Merge "Fix some broken tests in frameworks-net with native dependencies" am: 1fd2eb62...
authorHugo Benichi <hugobenichi@google.com>
Mon, 4 Sep 2017 05:46:54 +0000 (05:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Sep 2017 05:46:54 +0000 (05:46 +0000)
am: c08dcf6af7

Change-Id: Ibcc47204869e8debc031bf12851c233a14a9e535


Trivial merge