Shishir Agrawal 47fa171522 am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev ...

* commit 'c8787beca679ca593dda05bb151ebe4afdf441c8':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37

2014-10-29 22:48:43 +00:00

..

java

Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev

2014-10-29 00:15:51 +00:00

jni

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

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

res

Import translations. DO NOT MERGE

2014-10-29 06:18:50 -07:00

tests

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

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