commit | ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 03:34:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 03:34:24 2014 +0000 |
tree | b16ee16c2e8c299b1987b1f8cc1410dbf9fd9560 | |
parent | d00d2ff2079ca4e77173e3389834416494c7900f [diff] | |
parent | 76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97 [diff] |
am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev * commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97': Resource resolution bug fix. [DO NOT MERGE]