OSDN Git Service

am 2d0e51f8: am 03cb00b7: Fix sim-eng build.
authorBrian Carlstrom <bdc@google.com>
Wed, 25 Aug 2010 03:02:38 +0000 (20:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 03:02:38 +0000 (20:02 -0700)
Merge commit '2d0e51f8b7e373f5e3eeef065e7f54e65eeff4aa'

* commit '2d0e51f8b7e373f5e3eeef065e7f54e65eeff4aa':
  Fix sim-eng build.


Trivial merge