Alex Klyubin e36542faa6 am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev ...

* commit 'd1c5208bddd14812ae8e7b4f18a3d769e252d268':
  No need to explicitly enable TLS-PSK cipher suites.

2014-07-16 15:31:33 +00:00

..

android

am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs

2014-07-16 13:36:16 +00:00

com

resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp

2014-07-16 14:05:55 +01:00

jarjar-rules.txt

…

overview.html

…