OSDN Git Service

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

Change-Id: I3f8be95e56a05215265e96e542508792e7458e10


Trivial merge