OSDN Git Service

resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 19 Nov 2014 00:28:04 +0000 (16:28 -0800)
committerYing Wang <wangying@google.com>
Wed, 19 Nov 2014 00:28:04 +0000 (16:28 -0800)
commit0217e3b20b6a331b0820014dc136d782070bca45
tree6d85f6ebd5d5ca510c89e7e2f7cdc723e2a50c44
parent9a186a1c6dd501b1808fd3ab79317de5dec0669f
parenta4f415d65ea3bbf375b8b82a7ce5086612914679
resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp

Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
core/clear_vars.mk
core/prebuilt_internal.mk