tree db8070cf38ebcbf4fbfb9a209001ebc188428140
parent a0b882c940c6ce531775b2041d92ac00b9ebd7e5
parent 2ed63e0dcc34c16af6fa24eab7eb6ba448d9400f
author Deepanshu Gupta <deepanshu@google.com> 1412257199 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412257199 +0000

am 2ed63e0d: am 4ae7dbba: am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

* commit '2ed63e0dcc34c16af6fa24eab7eb6ba448d9400f':
  Resource resolution bug fix. [DO NOT MERGE]