Adam Lesinski 7dd87312c9 am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev ...

* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
  Minor resource notation/compatibility fixes

2014-10-17 20:28:47 +00:00

..

java

am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

2014-10-17 20:28:47 +00:00

jni

am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-16 09:35:43 +00:00

res

Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536

2014-10-17 00:15:02 +00:00

tests

am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-16 09:35:43 +00:00