Torbjorn Eklund 2cf376459b Merge "SFR sims should treat Spain as roaming" am: 06aed6950d ...

am: e5f8e6088e

Change-Id: Ifd7e98a0a1545f056128149e41fdfb35d479e54c

2017-01-30 20:14:52 +00:00

..

java

Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea

2017-01-30 17:57:02 +00:00

jni

Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b

2017-01-27 20:38:55 +00:00

res

Merge "SFR sims should treat Spain as roaming" am: 06aed6950d

2017-01-30 20:14:52 +00:00

tests

Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp

2017-01-27 06:39:52 +00:00