Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit d18dc005 authored by JP Abgrall's avatar JP Abgrall
Browse files

resolved conflicts for merge of a88c13bf to honeycomb-plus-aosp 



The Android.mk's LOCAL_SRC_FILES was different from gingerbread.

Change-Id: Ie1777a5f449e6b135320e92d0dc1c593869aa266
Signed-off-by: default avatarJP Abgrall <jpa@google.com>
parents 189de0c1 a88c13bf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment