Paul Duffin d441dca72b Merge "Follow-up to Switch to the latest version of Caliper" am: 80d5bef6f9 ...

am: 0ec9daecc6

* commit '0ec9daecc6129529fc6f2d66c29876eca88c492f':
  Follow-up to Switch to the latest version of Caliper

2015-12-08 06:17:03 -08:00

..

java

Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c

2015-12-08 10:55:07 +00:00

jni

Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517

2015-12-03 17:54:08 +00:00

res

Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c

2015-12-08 10:55:07 +00:00

tests

Follow-up to Switch to the latest version of Caliper

2015-12-08 13:58:08 +00:00