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

Commit a03ebe98 authored by Eric Laurent's avatar Eric Laurent
Browse files

resolved conflicts for merge of 00118a48 to honeycomb-merge 

Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
parents 16fad45b 00118a48

NOTICE

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ These files are Copyright (C) 2004-2010 NXP Software and 
Copyright (C) 2010 The Android Open Source Project, but released under

the Apache2 License.





                               Apache License

                           Version 2.0, January 2004

                        http://www.apache.org/licenses/