tree 382798a81d542c1950e901b6b77c45c17b676498
parent b2039f5df6d8d7e249093219764ef2ce5e9bcb37
parent a03671cc3b17da7881cb0bfbc04df40d2839024d
author Ying Wang <wangying@google.com> 1345747772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345747772 -0700

am a03671cc: (-s ours) Fix build warning.

* commit 'a03671cc3b17da7881cb0bfbc04df40d2839024d':
  Fix build warning.