OSDN Git Service

resolve merge conflicts of 836402e0e842584d47dddec49f9cb1f7d18fc833 to master
authorBenedict Wong <benedictwong@google.com>
Fri, 8 Mar 2019 21:22:04 +0000 (13:22 -0800)
committerBenedict Wong <benedictwong@google.com>
Fri, 8 Mar 2019 23:45:49 +0000 (23:45 +0000)
commit18a4ebb257693ba64f6364b67c8b2139747cf236
tree583b00659dca33773ed6a6d5b9a4dcbf274d2c65
parent18a4db5f5673f4b592cd62bf65168af3ca390432
parent836402e0e842584d47dddec49f9cb1f7d18fc833
resolve merge conflicts of 836402e0e842584d47dddec49f9cb1f7d18fc833 to master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
Android.bp
api/test-current.txt
services/core/jni/Android.bp
services/core/jni/onload.cpp