Tom O'Neill 24bd1740df am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev ...

* commit 'd0e2a2e7a9a6c247f501a5044d1c19cd82c6129d':
  Improve constant names for settings injection API

2013-09-03 13:28:24 -07:00

..

java

am 7eed075a: Merge "Don\'t call setLastChosen if it\'s a chooser activity instance" into klp-dev

2013-09-03 13:24:52 -07:00

jni

am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev

2013-09-03 10:49:07 -07:00

res

am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev

2013-09-03 13:28:24 -07:00

tests

Merge "Use core-tests-support instead of core-tests" into klp-dev

2013-08-30 23:21:27 +00:00