| commit | e8e850fb0a8426016b24caf096c48bdca7741fbc | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Aug 28 00:02:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 28 00:02:01 2015 +0000 |
| tree | aec4db438bee6be46f8e85514183e6826f2c5434 | |
| parent | 33265e6996bb98d6a5c14cab5167c22815f735a3 [diff] | |
| parent | c4bca0dc140ec88b4bc0293e28e253d02f916e6f [diff] |
am c4bca0dc: (-s ours) am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE] * commit 'c4bca0dc140ec88b4bc0293e28e253d02f916e6f':