OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)
commit95f862bcb0418fd931c574157a5c90312ea2fb77
tree9358fdfbcf37786b2c200f0cbeba3c8f31de8c0c
parent9514fca5c78c85b6f5e2d2497b05bbea2613daa8
parentf91e9e2729b7ac5224c82b347c3bc6a22ea020d8
merge from open-source master

Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
core/main.mk