- Amend: restore mpe changes - Amend: attempt rebase Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90 Conflicts: nativeLib/edex_com/.cproject nativeLib/edex_notify/.cproject Former-commit-id: 5bcf751c50 [formerly 9db548db3e] [formerly 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]] Former-commit-id: 326cae8be4 Former-commit-id: 573aeaa238
5bcf751c50
9db548db3e
326cae8be4
573aeaa238
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484
580e2938d7
66be3bec40
c83e5ff474
1faae42484
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f
a02aeb236c
9f19e3f712
06a8b51d6d
3360eb6c5f