OSDN Git Service

resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 29 Jul 2014 18:08:05 +0000 (11:08 -0700)
committerYing Wang <wangying@google.com>
Tue, 29 Jul 2014 18:08:05 +0000 (11:08 -0700)
commitbb3b27ac341efbfabd572e720a095c2fde0fdd1f
tree3062928db78487b2774ce38fd06c325d372569a2
parenta55c55ff5aa7436508d53ab86da965627671a8ff
parent9929fd661c48d17b04a8590e1be647abce9ed04c
resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp

Change-Id: I7f3b4111bb508e61d279fc4a78b2a2ebe8cfd6d9
core/package_internal.mk