Merge "Use SDK 25 to match the junit target"
am: 9a60bf31 Change-Id: Ic9c1343a902b0952559d90a4c5f8558d73ce8f15
Loading
am: 9a60bf31 Change-Id: Ic9c1343a902b0952559d90a4c5f8558d73ce8f15
mentioned in commit 5cd6f206
mentioned in commit 496c70c0
mentioned in commit c85b00aa