OSDN Git Service

am 683daacf: (-s ours) am d1aead76: Merge change Ie21b2327 into eclair-mr2
authorJesse Wilson <jessewilson@google.com>
Tue, 24 Nov 2009 17:56:59 +0000 (09:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Nov 2009 17:56:59 +0000 (09:56 -0800)
commit5b596f3276f36227f2ed8a15b7d0c7c3425d4f23
tree07c6f5b137be553f2179e1b0e6b454b5fa897a62
parent242a9c8d2e0cc09486b795ce0b7aaa327cd52a62
parent683daacf21830a0b0510320c735485c75749c4f1
am 683daacf: (-s ours) am d1aead76: Merge change Ie21b2327 into eclair-mr2

Merge commit '683daacf21830a0b0510320c735485c75749c4f1'

* commit '683daacf21830a0b0510320c735485c75749c4f1':
  DO NOT MERGE: Removing the use of FileCanonPathCache.