tree dcd56cea4ff5eb04ecb21f93975a62a2e95ef179
parent 9fe80cffaff03dab8b2059f6adbe4b2676885055
parent 10b432c35cf9b9c2abd0d5f484758bbedff5594f
author Michael Jurka <mikejurka@google.com> 1337634711 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337634711 -0700

am 10b432c3: am be4f1471: Merge "Fix incremental builds" into jb-dev

* commit '10b432c35cf9b9c2abd0d5f484758bbedff5594f':
  Fix incremental builds