Amith Yamasani 2e33e0df3c Merge \\"Resetting some settings on starting a new demo session\\" into nyc-mr1-dev am: bb1fb395ca ...

am: 5c451c08bc

Change-Id: I7e44f3ec7c29d0e1adfd5e4baff1cbfba7368bcc

2016-06-24 16:42:47 +00:00

..

java

Merge \\"Resetting some settings on starting a new demo session\\" into nyc-mr1-dev am: bb1fb395ca

2016-06-24 16:42:47 +00:00

jni

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e

2016-06-23 18:50:50 +00:00

res

Merge "Import translations. DO NOT MERGE"

2016-06-24 05:46:33 +00:00

tests

Merge "Refactor the java side APCT perf test"

2016-06-22 17:05:03 +00:00