tree 19cac51dea4d21724818034c37c238ab9e4f980a
parent 05be68698bfce2bd1635eab75d057f0bc4a6ceb5
parent 4478840931423f31351af8ec370a4421a460651b
author Treehugger Robot <treehugger-gerrit@google.com> 1502181003 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1502181003 +0000

Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"