Alan Viverette 7e79fd3ee2 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b ...

automerge: b64176b

* commit 'b64176bd87e08bcb952d6c22eea7ffd9a8b6df62':
  Clean up some javadocs in Window.setFeature...()

2014-10-28 00:32:19 +00:00

..

java

Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b

2014-10-28 00:32:19 +00:00

jni

am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev

2014-10-23 22:15:46 +00:00

res

am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev

2014-10-27 21:29:55 +00:00

tests

am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev

2014-10-23 22:04:11 +00:00