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)
commitc08dcf6af7484740ffbbe7c5e52bab55d20fba40
tree7eace9cc7ab035b79d1374b5962f20c423c8a781
parentd3a16793de403627188e5f2e7ec85e84ecfe92e5
parent72a20c39593cdb650b48d8fdc1e39f61d1e34aa8
Merge "Fix some broken tests in frameworks-net with native dependencies" am: 1fd2eb6276
am: 72a20c3959

Change-Id: I3f8be95e56a05215265e96e542508792e7458e10