closing unmatch bracket
removing duplicate namespace definition
Revert "Added support for multiple url shorteners"
Merge pull request #66 from g-ortuno/small-improvements

Small improvements
Merge pull request #69 from google/revert-61-master

Revert "Added support for multiple url shorteners"
Revert "closing unmatch bracket"

This reverts commit 76342986293369a8ce3fad47260152ea75c7a23b.
Merge pull request #65 from grahamoregan/master

Android application build errors
Fix one source of config disconnect problem

The MainActivity is using a fragment stack on a container for About and
Config but a different stack on a different container for
NearbyDevices. The result is a missing onPause call when entering
BeaconConfigFragment. This kept the BLE scan running at LOW_LATENCY.
Scanning and GATT connections cannot occur at the same time so this was
causing a problem.
MainActivity Code Inspection and cleanup

Remove warnings from Code Inspection.
Collapse calls A->B->C to A->B.
Use onPause/onResume to resume and pause the Scan Service.
add Arduino firmware example

uses on Arduino BLEPeripheral library and is compatible with nRF8001
and nRF51822 based Arduino boards/shields
Merge pull request #72 from sandeepmistry/arduino

add Arduino firmware example
About Fragment Code Inspection and cleanup

Fix text cut off when system font set to large
Fix press highlight of Learn More
Remove Inspection warnings
Update with XML format
Update gitignore

We don’t check in .idea files
Merge pull request #70 from schilit/Config-Bug

Fix one source of config disconnect problem.
Good find, thanks! Merging!
Merge pull request #74 from schilit/gitignore

Update gitignore.
Merged.
Merge branch 'master' of https://github.com/google/physical-web into MainActivity-Cleanup

Conflicts:

android/PhysicalWeb/app/src/main/java/physical_web/org/physicalweb/MainA
ctivity.java
Merge pull request #71 from schilit/MainActivity-Cleanup

MainActivity Code Inspection and cleanup.
Looks good to me. Thanks!
Merging.
Merge pull request #73 from schilit/About-Inspection

About Fragment Code Inspection and cleanup.
Looks good to me. Thank you!
Merging.
Updated iml file to match the preferred sdk.