commit | 082a9fa1735721a4025a60458e218978334a8d6d | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Tue Aug 08 08:48:56 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 08:48:56 2017 +0000 |
tree | c164332907509ca1bd8663c9d85f57bd7d79f7ee | |
parent | db554dfdfa9e2c34ea5bc04ce0d5b7de8c2c6f05 [diff] | |
parent | 607f74b317c9783fe9a046a012c74222be01518f [diff] |
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc114f -s ours am: 607f74b317 -s ours Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c