Amith Yamasani 5ac4d47091 am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev ...

* commit '7a9f541e596b4db8824969678896161c8e06d6bc':
  User restriction to disallow outgoing NFC beam

2014-09-09 20:35:52 +00:00

..

java

Merge "User restriction to disallow outgoing NFC beam" into lmp-dev

2014-09-09 20:29:57 +00:00

jni

Merge "Use sscanf() for parsing tag values." into lmp-dev

2014-09-09 20:29:36 +00:00

res

am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev

2014-09-09 18:09:04 +00:00

tests

Follow up API signature changes of CursorAnchorInfo part 2

2014-09-09 14:33:07 +09:00