android-platform-11.0.0_r36 includes a source file where a merge conflict 
wasn't resolved; 
https://android.googlesource.com/platform/packages/apps/Car/Settings/+/refs/tags/android-platform-11.0.0_r36/src/com/android/car/settings/accounts/AddAccountActivity.java#89

--
--
You received this message because you are subscribed to the "Android Building" 
mailing list.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/android-building?hl=en

--- You received this message because you are subscribed to the Google Groups "Android Building" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/android-building/5f4a7b73-0ea9-4b41-a040-5b1b9b7a4e92%40me.com.

Reply via email to