Jeff Brown 6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp ...

Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded

2014-04-09 16:47:40 -07:00

..

java

resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 16:47:40 -07:00

jni

am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"

2014-04-09 16:14:41 +00:00

res

Import translations. DO NOT MERGE

2014-04-07 09:16:57 -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