- added branch 20140204-federated-android
- fixed merge conflict in MediaEngine class
Android build scripts for core and stack added.
Android build script for core and stack now supports C++ 11. Toolchain switch from 4.4.3. to 4.7.
Switched android toolchain to 4.7. Exported header files. Minor fixes for android build.
Updated submodule
- video preview for Android
Merge remote-tracking branch 'origin/20131025-federated-cloud-contacts' into 20140204-federated-android
- audio and video over local UDP channel
https://github.com/openpeer/opandroid/issues/130
Added Backgrounding to the android makefile.
https://github.com/openpeer/opandroid/issues/145
- video capture rotation for Android
https://github.com/openpeer/opandroid/issues/131
- code cleanup for Android changes
https://github.com/openpeer/opandroid/issues/158
Merge branch 'feature-20140306-media-android' into 20140204-federated-android
- back camera enabled on Android
https://github.com/openpeer/opandroid/issues/187
updated gitignore to ignore android build files
Fixed local IP gathering from Android device.
https://github.com/openpeer/opandroid/issues/119
Merge branch 'master' into 20140204-federated-android

* master: (34 commits)
  - was 2x sending same data needlessly - was not filtering peer files from identity before sending to remote party
  - fixed potential deadlock if cancel is called before http request is complete - fixed potential crash if notification account cancelation happens before finder is spawned thus location is null
  - notification that application will quit and blocking until thread shutdown is processed https://github.com/openpeer/op-services-cpp/issues/34
  - missed interaction subscription method "subscribe" https://github.com/openpeer/op/issues/73
  - Add "tap" peer subscription window with self destruction timeout https://github.com/openpeer/op-core-cpp/issues/10
  - fix: moved final outside candidates beside ICE tags https://github.com/openpeer/op-core-cpp/issues/17
  - added ICE final flag for media https://github.com/openpeer/op-core-cpp/issues/17
  - fix: updated call log levels to more appropriate values https://github.com/openpeer/op-core-cpp/issues/17
  - fix: wasn't remembering candidate version once fetched https://github.com/openpeer/op-core-cpp/issues/17
  - fix: Don't wait for ICE to be ready for media https://github.com/openpeer/op-core-cpp/issues/8
  - wrap all of services::backgrounding in core layer https://github.com/openpeer/op-core-cpp/issues/12
  - fix: finished testing and fixing phased backgrounding https://github.com/openpeer/op/issues/73
  - Host / slave conversation need to push upon backgrounding https://github.com/openpeer/op-core-cpp/issues/6
  - Host / slave conversation needs to subscribe to backgrounding https://github.com/openpeer/op-core-cpp/issues/5
  - Xcode has changed warnings and thus "treat errors as warnings" will cause compile errors. Since this is a 3rd party library we will let them fix the warnings on master and then pull them in later
  - merge compile error fix - Xcode has changed warnings and thus "treat errors as warnings" will cause compile errors. Since this is a 3rd party library we will let them fix the warnings on master and then pull them in later - some project files were missing for Mac build
  - fix: Account object doesn't get in shutdown state https://github.com/openpeer/op/issues/74
  - fix: Account object doesn't get in shutdown state (partial fix, something else is still wrong) https://github.com/openpeer/op/issues/74
  - Account object doesn't get in shutdown state https://github.com/openpeer/op/issues/74
  - Each backgrounding phase needs an optional timeout setting https://github.com/openpeer/op-services-cpp/issues/33
  ...

Conflicts:
	libs/op-core-cpp
	libs/op-stack-cpp
	libs/ortc-lib
Fixed android build after merge with master.
https://github.com/openpeer/opandroid/issues/133
Merge branch '20140204-federated-android' into feature-20140306-media-android
- Media Engine changes for Core components on Android
https://github.com/openpeer/opandroid/issues/210
https://github.com/openpeer/opandroid/issues/11