OSDN Git Service

am 0fb728b6: am 28a18175: Don\'t use .. to reference the target file.
authorYing Wang <wangying@google.com>
Sat, 2 Jun 2012 16:28:34 +0000 (09:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 2 Jun 2012 16:28:34 +0000 (09:28 -0700)
* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
  Don't use .. to reference the target file.


Trivial merge