Wei Wang faf357e83c Properly handle registration timeout in BLE. am: 02bc008607 ...

am: cde5d3db24

* commit 'cde5d3db24da4b5b6b640d99595b281a75997ef3':
  Properly handle registration timeout in BLE.

Change-Id: I986e05659a660e69b79e1e762398370394106727

2016-05-13 18:37:36 +00:00

..

java

Properly handle registration timeout in BLE. am: 02bc008607

2016-05-13 18:37:36 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

res

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev am: 614c83d977

2016-05-13 00:56:49 +00:00

tests

Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev

2016-05-06 21:53:39 +00:00