Scott Main 3d66877b93 am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev ...

* commit '0763e1565b8e82a1754b21e7c9096b525402f724':
  some javadoc improvements for virtual display and new meta tag name

2013-10-16 16:36:03 -07:00

..

java

am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev

2013-10-16 16:36:03 -07:00

jni

am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:17:20 -07:00

res

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

2013-10-15 23:25:12 +00:00

tests

…