OSDN Git Service

am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds...
authorYing Wang <wangying@google.com>
Thu, 29 Jul 2010 17:32:19 +0000 (10:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jul 2010 17:32:19 +0000 (10:32 -0700)
Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
  Dist apkcerts.txt for unbundled builds

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge