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