tree 8c64414e6f079c9511163657f200d2ee132309f4
parent 4430670f48f75661293371dab8db55865f5f56e0
parent 08d9d9a46250c4fad66e9b637e8898a3524c4286
author Kenny Root <kroot@android.com> 1302561199 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302561199 -0700

am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."

* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.