OSDN Git Service

am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 23:47:41 +0000 (23:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 23:47:41 +0000 (23:47 +0000)
commitc4bca0dc140ec88b4bc0293e28e253d02f916e6f
tree85c8017324e2357c479e01bef23304dc922aafed
parent3dc7c4882090753ac9c1377a362004580105fd55
parent93db9633565331d91aac690382b432c9e689ad89
am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '93db9633565331d91aac690382b432c9e689ad89':