tree 9b12bdf8552f94f012b45692f090296182af876a
parent dd2bc2f3513051de175d5c373ccaeb0cfbba2794
parent 59582607bc341f9e9662d6ec5c1a93bb4c537d38
author Daisuke Miyakawa <dmiyakawa@google.com> 1255579524 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255579524 -0700

am 59582607: Fix a build breakage.

Merge commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38'

* commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38':
  Fix a build breakage.