OSDN Git Service

Merge "Fixing build"
authorAdam Cohen <adamcohen@google.com>
Mon, 4 Apr 2011 19:12:25 +0000 (12:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Apr 2011 19:12:25 +0000 (12:12 -0700)
commit458c89ec88d013a015610dbd47ffe7b86ad9b926
tree9e6efa730f6809bd12f2bed0f686de6757ba5ffa
parent1e8cc7b1f190a638a7b4ff8970a481b9f460d09b
parent2df1d33f68424587753a2a538ab10a7047fc6703
Merge "Fixing build"