OSDN Git Service

am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e67...
authorJoe Onorato <joeo@google.com>
Thu, 26 Jul 2012 05:24:02 +0000 (22:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 05:24:02 +0000 (22:24 -0700)
commit2dd9902cf965f7662eff9e84c5c8d47c3f7536af
tree86eec01414d99965ce8c7267fb714f4488b40267
parent42f0127a068ecb540dc98dea23932e074d127b20
parent4ae631f4560d383c28767641bb7e9e47ab175c7f
am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
  Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
core/main.mk