OSDN Git Service

Merge "Fix build."
authorBrian Carlstrom <bdc@google.com>
Wed, 22 Jun 2011 21:45:10 +0000 (14:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jun 2011 21:45:10 +0000 (14:45 -0700)
commit9fcb6404557e074bc3d8497785e3a5ecd8c5fc86
treec16c788b2e7a62de5b85b9fecf5b9b2674e76c8f
parent54b5eae0ac98779e3167788df06e6a4c1721d8cd
parent574ce433aa16ac9a89584cfe7b9e17d005b1f385
Merge "Fix build."