John Spurlock 93e40ba6c4 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev ...

* commit 'ee990413b51b41e4fe8940cba703bdfb56a12018':
  Zen: Show "(until 4:56 PM)" in exit conditions.

2014-10-28 17:17:03 +00:00

..

java

Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev

2014-10-28 17:08:43 +00:00

jni

Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev

2014-10-23 21:59:26 +00:00

res

am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev

2014-10-28 17:17:03 +00:00

tests

Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev

2014-10-28 07:53:37 +00:00