Re: [LSK] linaro-android topic branch updates for lsk-v3.1{4, 8}-android for 15.11

Amit Pundir amit.pundir@linaro.org writes:

Please pull aosp/android-3.1{4,8} directly into linux-linaro-lsk-v3.1{4,8}-android for 15.11. There are no linaro-fixes to go on top this time around as well.

I pulled these a couple days ago, but forgot to reply.

Just a heads up that I ran into a trivial merge conflict[1] with aosp/android-3.18.

Thanks again for doing the conflict resolution. Mine turned out slightly different than yours, but only in whitespace. Please have a look and let me know if mine is not OK.

Kevin