- Amend: restore mpe changes - Amend: attempt rebase Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90 Conflicts: nativeLib/edex_com/.cproject nativeLib/edex_notify/.cproject Former-commit-id: 5fb2f3ae5276385fb65c2102ad7619a855947632
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f