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

automerge: e0fceba

* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
  Update AM/PM selectors for clock face TimePicker

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

..

java

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

2014-10-17 00:15:02 +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