Bug 1051715 - Emulator: Handle temporary mode clir. r=vicamo
Merge pull request #111 from aknow/clir

Bug 1051715 - [Telephony] Show correct phone number in temporary mode clir. r=vicamo
Bug 824145 - B2G STK: Support for STK icon display (emulator). r=vicamo
Merge pull request #112 from jessi3py/bugzilla/824145

Bug 824145 - B2G STK: Support for STK icon display (emulator). r=vicamo
Bug 1051664 - B2G RIL: Add marionette tests for EF_OPL wild char. v2. r=Vicamo.
Merge pull request #115 from chenghuk/1051664

Bug 1051664 - B2G RIL: Add marionette tests for EF_OPL wild char. r=vicamo
Merge remote-tracking branch 'b2g/master' into b2g-jellybean
Bug 1054934: Add libnfcemu to build scripts, r=vicamo

With this patch the emulator binary statically links against the
NFC emulation library 'libnfcemu'.
Bug 1054934: Replace internal NFC emulation by libnfcemu, r=dlee