| commit | c85b00aa34e729f63c9d5140f86cf22019750ab5 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Fri Dec 09 13:38:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 09 13:38:45 2016 +0000 |
| tree | 4863081bdfa620b73292c85b632cf77f8081953c | |
| parent | dcfef4a7d4c1b4dccffd071819862732aaf8d1f7 [diff] | |
| parent | 5cd6f2067cf89426226e0191b9166f11f763c1bd [diff] |
Merge "Use SDK 25 to match the junit target" am: 9a60bf3100 am: 8fd99c2f7f am: 5cd6f2067c Change-Id: Ic9c12866c5f8aa86537278ae2de87f0794504247