OSDN Git Service

am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 2 Oct 2014 09:30:31 +0000 (09:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Oct 2014 09:30:31 +0000 (09:30 +0000)
commit2fca3e944f263bd50e4f61049399bddf957c936c
tree4e163618c234e61d5b5252064659766a87f67037
parent81f03898e59400bb77eb6525956b06e6762b550e
parentd3adf40ee0845844ed132dd0b25ec0102b9bf919
am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

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