Alex Klyubin dcf5af38bf am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs ...

* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.

2014-10-31 15:48:44 +00:00

..

java

am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs

2014-10-31 15:48:44 +00:00

jni

Surface:lockHardwareCanvas DO NOT MERGE

2014-10-22 08:33:31 -07:00

res

Import translations. DO NOT MERGE

2014-10-29 06:28:28 -07:00

tests

Add delay in ping connectivity test retry

2014-10-22 18:34:43 -07:00