| commit | c4bca0dc140ec88b4bc0293e28e253d02f916e6f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 27 23:47:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 23:47:41 2015 +0000 |
| tree | 85c8017324e2357c479e01bef23304dc922aafed | |
| parent | 3dc7c4882090753ac9c1377a362004580105fd55 [diff] | |
| parent | 93db9633565331d91aac690382b432c9e689ad89 [diff] |
am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE] * commit '93db9633565331d91aac690382b432c9e689ad89':