OSDN Git Service

am ab7f5033: (-s ours) Cherry-pick fix for renamed asset from master - do not merge
authorTeng-Hui Zhu <ztenghui@google.com>
Tue, 20 Sep 2011 01:38:55 +0000 (18:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Sep 2011 01:38:55 +0000 (18:38 -0700)
* commit 'ab7f5033f435437499cefc7066915f88a7f1cae9':
  Cherry-pick fix for renamed asset from master - do not merge


Trivial merge