tree ac8ae64ae477626159be83915756535f7dd9f3ee
parent 29b6918fddf7eb4eef4a1defa322f294fbd8fc5c
parent f3c068db26fd1c862f06423714aadf75bf45136b
author Conley Owens <cco3@android.com> 1325010490 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325010490 -0800

am f3c068db: (-s ours) am d38c870d: Get build system to work with Make 3.82

* commit 'f3c068db26fd1c862f06423714aadf75bf45136b':
  Get build system to work with Make 3.82