On 05/16/2013 09:18 PM, Viresh Kumar wrote:
On 16 May 2013 22:58, John Stultz <john.stu...@linaro.org> wrote:
Do you have a git branch with the queue you just sent Todd available? It
probably would be easiest to just merge that in.
Yes I do have it. It is android-experimental-3.9 based. Can we merge
that simply with linux-linaro or it is required to be rebased of your
tree first?
No, the linaro.android branch is currently a merge branch (I try to
merge as long as I can before doing rebases as it makes pulling in other
work much easier.
I might also suggest Andrey merge that branch in directly, as I try to keep
the linaro.android tree aligned as closely as possible with AOSP, and avoid
mixing other functionality into it.
Andrey if you're overloaded, let me know and I'll do a linaro.android +
Viresh's work merge in a separate branch and send you that git url.
I am happy with both. I can keep that branch with me.
Ok.
thanks
-john
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev
