tree 98040fb1b7f14cbfd8da36a8e9eedd2623ee1396
parent f3a142b8d5b4db7299b706653f4fd2952f4e5d8c
parent 0962b71980b7e850a1ef87766ae12de16ab2efb4
author Bill Napier <napier@google.com> 1282756249 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282756249 -0700

am 0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread

Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp

* commit '0962b71980b7e850a1ef87766ae12de16ab2efb4':
  DO NOT MERGE: Fix the build by ignoring directories that don't exist.