Robert Ly 84f00277b1 am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs ...

* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5

2014-08-13 16:12:37 +00:00

..

java

am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs

2014-08-13 16:12:37 +00:00

jni

am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

2014-07-30 17:44:20 +00:00

res

am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev

2014-07-24 18:06:03 +00:00

tests

am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

2014-07-18 03:31:43 +00:00