| commit | b71ec00c2d9133e84aa61c460933cf5387028ea0 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Mon Sep 04 06:05:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 04 06:05:26 2017 +0000 |
| tree | 2e9e8163f93f9116fb56b21e6f0d295966af9eed | |
| parent | acae4ad572a7e97d50bf2f9aa77ce8fd66cdface [diff] | |
| parent | 41be81318cfcec3aed1ba1ea3b75a9bdee2a1bd4 [diff] |
Merge "Fix some broken tests in frameworks-net with native dependencies" am: 1fd2eb6276 am: 72a20c3959 am: c08dcf6af7 am: 41be81318c -s ours Change-Id: Ib5c464452fc7e50e076512ef9c7fd5323874b693