Brad Leege 511801c17a [android] #5303 - Updating code to take properly merge what each branch intended for nativeUpdateMarker

2016-06-09 17:01:23 -05:00

..

java

[android] #5303 - Updating code to take properly merge what each branch intended for nativeUpdateMarker

2016-06-09 17:01:23 -05:00

res

changed satellite-hybrid to street in string.xml

2016-06-03 14:58:43 -04:00

res-public/values

[android] #4021 - fix up library resource prefix

2016-02-25 10:51:30 +01:00

resources/fabric

[android] #5284 - Setting 4.1.0-beta.2 version information

2016-06-08 14:04:41 -05:00

AndroidManifest.xml

[android] #2421 - Adding WIFI_STATE to SDK permissions

2016-02-10 19:05:23 -08:00