Mark Salyzyn 24dbfdaa70 am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" ...

* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues

2014-04-16 19:51:10 +00:00

..

java

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

2014-04-16 12:14:34 -07:00

jni

am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

2014-04-16 19:51:10 +00:00

res

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

2014-04-16 15:28:29 +00:00

tests

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

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