tree 24d1d56882cf93b54af15079b37d7585f4820606
parent 99887e9630edd2af6fc4535104d3e88c19364081
parent d59b5d0087c103db6bffd3cd84565ebf7fa0bb27
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.