commit | 02aa35f57c1784c2355230cbcced33cb3ffd0c38 | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Tue Aug 08 09:08:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 09:08:32 2017 +0000 |
tree | 18d607ff29c88104da78be6694257ae6933ce11a | |
parent | 3100ac7351862e1c38dad4920a365dcf2e12c03a [diff] | |
parent | 31bed69b5f399756761358a1ee2d609dde16f84c [diff] |
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc114f -s ours am: 607f74b317 -s ours am: 082a9fa173 am: c9ef02ca17 am: 31bed69b5f -s ours Change-Id: Ib639b95a1d277149dde27d0fa62033ec183dd5c3