OSDN Git Service

am cfb0664e: Merge "Tries to resolve reference resource names instead of its data...
authorJon Miranda <jonmiranda@google.com>
Wed, 10 Sep 2014 20:43:05 +0000 (20:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 20:43:05 +0000 (20:43 +0000)
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
  Tries to resolve reference resource names instead of its data.


Trivial merge