tree 43a6be210816db45aac41a90cb88e79aaf2a6ead
parent e452cb2aa9236ebecb090e03a469fa68aef8d497
parent 22c3bbde1128029c4d4e6fe34ee0b56f530629ac
author Elliott Hughes <enh@google.com> 1361932993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361932993 +0000

am 22c3bbde: Merge "Fix build."

* commit '22c3bbde1128029c4d4e6fe34ee0b56f530629ac':
  Fix build.