| commit | c9ef02ca17689d5ec4dbee1f5748caebd0c9cfd4 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Tue Aug 08 08:55:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 08:55:42 2017 +0000 |
| tree | 0e3ee3d432b113bf539badce06c823cf25bca34d | |
| parent | 86e04cb37007b527e79ab5aebf0ffdad3a4ff347 [diff] | |
| parent | 082a9fa1735721a4025a60458e218978334a8d6d [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 Change-Id: If6ad00b1ee146f73ee62a5a7d5e3992ee29b6fd2