OSDN Git Service

resolve merge conflicts of e82f56c4f7 to nyc-dev-plus-aosp
authorNeil Fuller <nfuller@google.com>
Thu, 10 Mar 2016 10:00:14 +0000 (10:00 +0000)
committerNeil Fuller <nfuller@google.com>
Thu, 10 Mar 2016 10:00:14 +0000 (10:00 +0000)
commitd7737f19c5be65cf78c704dc1172ade5f8336d31
tree24a77eb2bc3ccc90da91313c606799feb1782a70
parent544bff0f3ff70885173760ef901ae907e6f869f7
parente82f56c4f72772284fa1db5094f78b8bd71359a2
resolve merge conflicts of e82f56c4f7 to nyc-dev-plus-aosp

Change-Id: I7b673e680240d0a597af971b6d903327875c4734
core/java_common.mk