Marie Janssen 30975ad80b Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642 ...

am: 51f620d98d

Change-Id: I3818fdbfc3ad60a731bdf3b7f047a2afca04ad2e

2016-06-21 21:38:25 +00:00

..

java

Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642

2016-06-21 21:38:25 +00:00

jni

Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev

2016-06-21 19:27:33 +00:00

res

Import translations. DO NOT MERGE

2016-06-21 00:24:26 -07:00

tests

Merge \"Fixed notificaiton Stress Test\" into nyc-dev

2016-06-21 20:47:29 +00:00