OSDN Git Service

resolved conflicts for merge of a15ae216 to stage-aosp-master
authorYing Wang <wangying@google.com>
Tue, 1 Sep 2015 16:31:56 +0000 (09:31 -0700)
committerYing Wang <wangying@google.com>
Tue, 1 Sep 2015 16:31:56 +0000 (09:31 -0700)
commit9bf627422c33102b4a06eebf5d1884490faae8c7
tree4f59e91d22a8cda294c8551508f7552b24588ea6
parentf04f391b5f036563f71aa0c1805dc86c09137e98
parenta15ae2160a044e57c65f44a310c442dd470a2b96
resolved conflicts for merge of a15ae216 to stage-aosp-master

Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
core/java.mk