tree 39f269387d74beec3a0b9230967bfb79b6062e14
parent 786246ebf1fd4b875f33a8b0c35bab2a3df911b3
author Yaowu Xu <yaowu@google.com> 1308780424 -0700
committer Yaowu Xu <yaowu@google.com> 1308845984 -0700

fix build issues for experimental branch

experimental branch build was broken from some merge artifacts, this
commit fixes those issues to enable the experimental branch to build.

Change-Id: Ic52b2d2f1d1b80abb7ecaa4c0927bcf887ac0c2a