| commit | 2ed63e0dcc34c16af6fa24eab7eb6ba448d9400f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 09:45:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 09:45:29 2014 +0000 |
| tree | 4863f0219a34413889a716923a90aa7bb3ed8d1d | |
| parent | 6351c2023b6f85f3d397ef79456b109fab37f850 [diff] | |
| parent | 4ae7dbbaa0a6cfd7bf9ec4131720f67b265ee0d2 [diff] |
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 '4ae7dbbaa0a6cfd7bf9ec4131720f67b265ee0d2': Resource resolution bug fix. [DO NOT MERGE]