FYI

---------- Forwarded message ---------- From: Jean-Baptiste Queru jbq@android.com Date: 28 August 2012 15:59 Subject: Contributions and conflict-prone areas To: android-contrib@googlegroups.com

I've been looking at many Android contributions recently, which gives be some good visibility over the difficulties in merging changes all the way upstream into Google's internal tree.

Generally speaking, at the moment the gap between AOSP and Google's internal master tree is unusually small, and that allows a very large majority of contributions to merge without conflicts.

By looking at many changes, I spotted 3 areas where merges don't go smoothly. Those areas are Bluetooth, Email, and Location, and most changes related to those cause merge problems. Digging a bit, those look like they've been refactored quite heavily in Google's internal tree, which causes the conflicts. For anyone considering to contribute in any of those 3 areas. I recommend waiting until the next major release (and I don't have any ETA for it).

From what I've seen, merges are uneventful in all other areas of the

Android tree.

Thanks, JBQ

-- Jean-Baptiste M. "JBQ" Queru Technical Lead, Android Open Source Project, Google.

Questions sent directly to me that have no reason for being private will likely get ignored or forwarded to a public forum with no further warning.

--