Bug 845174 - B2G emulator: support RIL_UNSOL_CALL_RING. r=vicamo
Merge pull request #25 from hsinyi/bugzilla/845174/master

Bug 845174 - B2G emulator: support RIL_UNSOL_CALL_RING. r=vicamo
Bug 821615 - B2G 3G: Unable to deactivate data call on emulator. r=vicamo
Merge pull request #43 from jessi3py/jessica-master

Bug 821615 - B2G 3G: Unable to deactivate data call on emulator. r=vicamo
Merge remote-tracking branch 'b2g/master' into b2g-jellybean
Merge tag 'android-4.3_r2.1' into b2g-jellybean

Android 4.3 release 2.1