OSDN Git Service

am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missin...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 01:56:00 +0000 (01:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:56:00 +0000 (01:56 +0000)
* commit '4de90cf0a96ef215e1b6179a5bc8bff18266ce77':
  Add missing resolveResValue call. [DO NOT MERGE]


Trivial merge