Xia Wang 454fc6b118 am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev ...

* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.

2014-03-18 22:34:17 +00:00

..

java

am cdf00888: add option to shutdown after factory reset

2014-03-18 20:49:12 +00:00

jni

am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."

2014-03-18 09:41:31 +00:00

res

Import translations. DO NOT MERGE

2014-03-17 09:34:19 -07:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00