Adam Lesinski b9dcdccbce Merge "Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev am: daeee0b" into nyc-dev-plus-aosp ...

am: e0bd3a0

* commit 'e0bd3a07ed46dc9570976eeaabe9d5031c35efb4':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: Id83ac464c1a744a4b2538f23908c72ffc453249d

2016-04-12 22:37:39 +00:00

..

java

Merge "Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev am: daeee0b" into nyc-dev-plus-aosp

2016-04-12 22:37:39 +00:00

jni

Merge "Remove LOAD_OS_APP message from standard context hub messages" into nyc-dev am: 250c617

2016-04-12 19:01:01 +00:00

res

Merge "Remove config_wifi_hal_pno_enable and config_wifi_ssid_white_list_enable" into nyc-dev am: 143a933

2016-04-12 17:29:42 +00:00

tests

Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev am: 4b92594

2016-04-12 00:48:10 +00:00