| commit | 1da9c2b38fc6e59178e10ed82ac266f7a25d1aba | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 13:47:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 13:47:57 2014 +0000 |
| tree | 611d6c8ebe3a746d427c76f07fda909fed608641 | |
| parent | 9298ba5c201fccc2002924b518e80de1eb6f6fc8 [diff] | |
| parent | be334a3a0916fc93047a1411a0e22316ce03371c [diff] |
am be334a3a: (-s ours) 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 'be334a3a0916fc93047a1411a0e22316ce03371c': Resource resolution bug fix. [DO NOT MERGE]