OSDN Git Service

resolved conflicts for merge of eec386a4 to master
authorYing Wang <wangying@google.com>
Wed, 15 Apr 2015 21:39:26 +0000 (14:39 -0700)
committerYing Wang <wangying@google.com>
Wed, 15 Apr 2015 21:39:26 +0000 (14:39 -0700)
commit87a21c8b893bab839d0052db2297e10bc2bc82e3
tree2587a7ce12498a18ef2095493f279965e177a021
parent599b07a4b24444be1c07db4d98b7af7848951936
parenteec386a4df21c58403f6b959247689307f99a91e
resolved conflicts for merge of eec386a4 to master

Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
core/package_internal.mk
core/prebuilt_internal.mk