| commit | 4ae7dbbaa0a6cfd7bf9ec4131720f67b265ee0d2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 09:38:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 09:38:24 2014 +0000 |
| tree | 66c0ed78f6719516468fa3d9e16f74d2b0601228 | |
| parent | 3a8634010676413b2373c074ffbdea21bff33dba [diff] | |
| parent | 2fca3e944f263bd50e4f61049399bddf957c936c [diff] |
am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev * commit '2fca3e944f263bd50e4f61049399bddf957c936c': Resource resolution bug fix. [DO NOT MERGE]