| commit | be334a3a0916fc93047a1411a0e22316ce03371c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 13:39:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 13:39:59 2014 +0000 |
| tree | db8070cf38ebcbf4fbfb9a209001ebc188428140 | |
| parent | a0b882c940c6ce531775b2041d92ac00b9ebd7e5 [diff] | |
| parent | 2ed63e0dcc34c16af6fa24eab7eb6ba448d9400f [diff] |
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]