OSDN Git Service

Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
authorHugo Benichi <hugobenichi@google.com>
Tue, 8 Aug 2017 08:40:40 +0000 (08:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 08:40:40 +0000 (08:40 +0000)
commit607f74b317c9783fe9a046a012c74222be01518f
tree2fd6e09d3200b336c5304548e5f847a8542d639e
parenta22fbf4534cf161f9b43c14e03de16a7b6208803
parentc06dbc114f839112f1132e1e0edac8533b3f4c54
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
am: c06dbc114f  -s ours

Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d