Alan Viverette e0fceba162 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev ...

automerge: 0db6536

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

2014-10-17 00:00:30 +00:00

..

java

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

2014-10-16 23:48:38 +00:00

jni

Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev

2014-10-08 19:58:13 +00:00

res

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

2014-10-17 00:00:30 +00:00

tests

Add CHANGE_NETWORK_STATE permission to bt tests

2014-10-15 14:06:30 -07:00