OSDN Git Service

resolved conflicts for merge of 9b5447df to master
authorYing Wang <wangying@google.com>
Fri, 29 Jul 2011 21:25:59 +0000 (14:25 -0700)
committerYing Wang <wangying@google.com>
Fri, 29 Jul 2011 21:25:59 +0000 (14:25 -0700)
commit603755d6cebc50d2f9debeec284f6614e085170d
tree79f078fe1444f67cf6eda5f82122fc0fdf7ed601
parent44067211572126ab39456580059cac6cdd0228f6
parent9b5447df850ea7452b49ea6622d84692c39b133c
resolved conflicts for merge of 9b5447df to master

Change-Id: I1fe490a9e0bf01321c845ab0150fead06c16d68b
core/user_tags.mk
target/product/core.mk