+++ This bug was initially created as a clone of Bug #1128837 +++ According to hardware/ril branch model [1], master branch need to be upgraded to version 10 for emulator-l. [1] https://wiki.mozilla.org/B2G/Emulator#Branch_Model

Hi Hal, we fixed some merging error in b2g-kitkat branch and the git.m.o [1] stopped mirroring the branch due to the history is changed. Could you please help us to fix git.m.o mirroring? Thank you in advance. [1] http://git.mozilla.org/?p=b2g/platform_hardware_ril.git;a=summary

Changing history is frowned upon, or at least it was, in the android world. In the past, this has caused problems for partners. Each of them will need to take special action to successfully pull. Before we push this change to git.m.o, I'll need confirmation that b2g team has given partners a head's up, so they will know what to do when their pulls break. (An alternative is to redo the fixup so it is able to be fast-forwarded. Please NI me again after that email has been sent. ni: mwu for confirmation this is still current approach ni: echen for ack on communication being sent

No partners depend on this repo.

This particular repo is only used by our emulators for testing purposes.

(In reply to Michael Wu [:mwu] from comment #3) > No partners depend on this repo. (In reply to Michael Wu [:mwu] from comment #4) > This particular repo is only used by our emulators for testing purposes. Thanks for the explanation, Michael.

Hi Hal, this repo is only used by our emulator for automation testing, there is no partners depend on this. Thank you.

Since no partners depend on this, we'll just change the permissions to allow non Fast Forward commits and deletes.

Comment on attachment 8632163 [details] [diff] [review] bz1134982.patch checked in as 4fae742312658c0cce46d0d60633925f6e475a28

:echen - you should be good. Sorry I didn't notice this wasn't a separate bug just for the repo issue - back to you!

(In reply to Hal Wine [:hwine] (use NI) from comment #9) > :echen - you should be good. Sorry I didn't notice this wasn't a separate > bug just for the repo issue - back to you! Thanks for your help, Hal. :)

Comment on attachment 8639729 [details] [b2g-manifest] PR #366, Switch hardware/ril to proper branch for emualtor-kk and emulatro-l In this pull request, we switch hardware/ril to proper branch for emulator-l and emulator-kk, - emulator-l: In bug 1126695, hardware/ril was fetched from caf's repo because emulator-l was only needed to support buildbot at the time. Now we plan to support automation test on emulator-l, so we have to switch hardware/ril to mozilla's repo and start porting our changes into it (from b2g-kikat). - emulator-kk: After some discussion, we just realize that using `master` for emulator-kk isn't a good idea, so I correct that as well, although we decide move to emulator-l. Thank you.

Comment on attachment 8639729 [details] [b2g-manifest] PR #366, Switch hardware/ril to proper branch for emualtor-kk and emulatro-l Try result: https://treeherder.mozilla.org/#/jobs?repo=try&revision=bb98140db6aa

Comment on attachment 8639729 [details] [b2g-manifest] PR #366, Switch hardware/ril to proper branch for emualtor-kk and emulatro-l https://github.com/mozilla-b2g/b2g-manifest/commit/523005a641f51138252bbaaa4cc204fff3675b7d

Comment on attachment 8643643 [details] [platform_build:b2g-5.1.0_r1] PR#125, Enable ro.moz.ril.query_icc_count on emulator-l Enable `ro.moz.ril.query_icc_count` on emulator-l (just like what we did on emulator-kk in bug 1116360). Hi Thomas, may I have your review? Thank you.

Comment on attachment 8643643 [details] [platform_build:b2g-5.1.0_r1] PR#125, Enable ro.moz.ril.query_icc_count on emulator-l b2g-5.1.0_r1: https://github.com/mozilla-b2g/platform_build/commit/05a36844c1046a1eb07d5b1325f85ed741f961ea