Steven Moreland b5da32c177 Update makefiles. ... Removes redundant "java-static" target. Note, targets aren't removed here which have internal targets that depend on them. Bug: 36376126 Test: pass Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac		2017-08-03 15:25:21 -07:00
..
1.0	Update makefiles.	2017-08-03 15:25:21 -07:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:05:29 +02:00