| commit | 2fca3e944f263bd50e4f61049399bddf957c936c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 09:30:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 09:30:31 2014 +0000 |
| tree | 4e163618c234e61d5b5252064659766a87f67037 | |
| parent | 81f03898e59400bb77eb6525956b06e6762b550e [diff] | |
| parent | d3adf40ee0845844ed132dd0b25ec0102b9bf919 [diff] |
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]