| commit | d3adf40ee0845844ed132dd0b25ec0102b9bf919 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 08:51:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 08:51:06 2014 +0000 |
| tree | baebddb5d6824ad36e966f36c244b0a75b70bce4 | |
| parent | ba526a288811bc6520ad9a70d57e7ef774bbb802 [diff] | |
| parent | ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6 [diff] |
am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev * commit 'ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6': Resource resolution bug fix. [DO NOT MERGE]