GitHub user miomin opened a pull request: https://github.com/apache/incubator-weex/pull/1147
[Android] Merge WeexCore-master to master once. You can merge this pull request into a Git repository by running: $ git pull https://github.com/miomin/incubator-weex master-0504 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1147.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1147 ---- commit d9268996d2f3c233ac4d34ef543d10f1a1288241 Author: misakuo <misakuo@...> Date: 2018-04-25T09:13:23Z windmillæ¹é commit 5dd0342a89c2dbc8cc6636c34b8e788a40ce97e3 Author: wentao.swt <wentao.swt@...> Date: 2018-04-25T03:24:43Z Merge branch 'WeexCore-master' into master-0504 commit 38e3d671ebde3cee8b33bb6383458f6d051a7609 Author: wentao.swt <wentao.swt@...> Date: 2018-04-26T02:20:46Z * [android] update so for remove log commit 904a0e143fbe53bbe9efcd34a442bea81a3831f9 Author: wentao.swt <wentao.swt@...> Date: 2018-04-26T03:27:44Z * [android] update X86 so commit 90c4ce12eca62ca2373f84ee6f6b783d129223de Author: 驱影 <jike.yjk@...> Date: 2018-04-26T03:36:03Z *[Core] fix page close wonât clean msg in handler. commit cc9a8674155d0a9e6411b68449a7dd876f2eade1 Author: ç«ç <listen.ls@...> Date: 2018-04-26T07:40:22Z [WeexCore] merge devTool commit 4546a0738b743fdc3dd80e7dbee7620192431c9f Author: ç«ç <listen.ls@...> Date: 2018-04-26T07:44:58Z [WeexCore] rename jsfunction_impl_android.cpp commit 33758c5c39720fddefcf86f6d25d8abc81af47f6 Author: Hanks <zhanghan.me@...> Date: 2018-04-26T08:15:14Z * [android] git cherry pick 0f294f0d4311ebb308d694accfe254e725f947e1 commit 60353328410d832a4082b6b210ce8309f2b9433c Author: ç«ç <listen.ls@...> Date: 2018-04-26T08:22:54Z [WeexCore] merge devTool commit efd7dbf880bac28b1109bf969fbb07a6b83dcc44 Author: wentao.swt <wentao.swt@...> Date: 2018-04-26T08:25:11Z *[android] fix register module fail bug commit f9c045c8fdfe4186d07bcc7bf7e36ecf172245d3 Author: miomin <691292118@...> Date: 2018-04-26T08:48:01Z * [android] git cherry-pick cc1ee583cce2f6e8f1fbc74f088c70cb826d4bad commit 3e7e7373c77d5d2f17eb740148ec5420d7641360 Author: wentao.swt <wentao.swt@...> Date: 2018-04-26T08:46:39Z * [android] fix null pointer crash commit 9c49b4f4a37cbb76aaf56a6d296f419c07ccd3b7 Author: Hanks <zhanghan.me@...> Date: 2018-04-26T11:06:19Z * [jsfm] upgrade js framework to v0.26.1 commit 92a1653414c971781d45bdf0a25fdebb751de159 Author: Hanks <zhanghan.me@...> Date: 2018-04-26T12:25:59Z * [jsfm] upgrade js framework to v0.26.1 commit 7848674098428194b027a105a92d7bf5628e59dd Author: Hanks <zhanghan.me@...> Date: 2018-04-26T13:20:06Z * [jsfm] upgrade js framework to v0.26.2 commit 676b516805673fb5bcd655f2b2faa7473ecc6d5f Author: Hanks <zhanghan.me@...> Date: 2018-04-26T13:58:45Z * [jsfm] reset the modification of the weex-rax-api commit 08778022200f4b7f0f1314f0cae4ae474ac44cc7 Author: misakuo <misakuo@...> Date: 2018-04-26T14:09:55Z update jsfm commit bc5ae5bea67723ac0a447061339c2cb84ff39598 Author: Hanks <zhanghan.me@...> Date: 2018-04-26T14:35:59Z * [jsfm] upgrade js framework to v0.26.2 commit 7e85f7566b61246e08c2a94d61ad793903b119f5 Author: wentao.swt <wentao.swt@...> Date: 2018-04-26T15:03:14Z * [android] update commit 9bf1010d16ca7284b1b10177cf37e86cfb1015f6 Author: ç«ç <listen.ls@...> Date: 2018-04-27T04:21:45Z [WeexCore] fix LOG params commit 3744951d19381b3264a92ea6c2a04e6d33a7516e Author: Hanks <zhanghan.me@...> Date: 2018-04-27T06:53:31Z * [jsfm] upgrade js framework to v0.26.3 commit ea6de387e6e9dd642b74eba85b9fb5278d0574a4 Author: wentao.swt <wentao.swt@...> Date: 2018-04-27T09:10:10Z * [android] update commit 92a3dda9d953f3249c75b99d907bf6caea32fcd0 Author: wentao.swt <wentao.swt@...> Date: 2018-04-28T03:54:56Z * [android] update so commit 4c1c1d5397444281584de5eb669776300069166d Author: miomin <691292118@...> Date: 2018-04-28T04:14:19Z * [Core] Turn off FlatGUI. commit d783570aff0b8ec97ae296da0be72378c0ef05b6 Author: miomin <691292118@...> Date: 2018-04-28T06:45:14Z Revert "* [Core] Turn off FlatGUI." This reverts commit d75a181d27e75ba7b506fa325f265eb85f0ce0d9. commit 59ad9854c2d2aa9053c49b32f4720702d7cacfb2 Author: jianbai.gbj <jianbai.gbj@...> Date: 2018-04-28T07:10:01Z [Weex][Android] 7.7.5 weex-core transition not start bugfix http://dotwe.org/vue/73f432adf4d115456bcdd8fd4ce924f1 commit 07a36526bcf7fb02b4b380a0b844341b22775c15 Author: miomin <691292118@...> Date: 2018-04-28T07:11:04Z * [Core] Turn off FlatGUI. commit b9e4b4e24b2e4ee490aa58a7826f97e9c5669daa Author: YorkShen <shenyuancs@...> Date: 2018-04-28T07:32:25Z * [Core] Update textContentBoxMeasurement to avoid crash commit dcf3ac90ba46cc50a259c7459b544e0a8e69f2c9 Author: miomin <691292118@...> Date: 2018-04-28T08:41:01Z * [Core] Fix crash NPE. commit 555e9a1e400902c973b8f7ad5057fcda44f815a6 Author: miomin <691292118@...> Date: 2018-04-28T08:41:35Z * [Core] Open FlatGUI ---- ---