OSDN Git Service

am 5a8e1d54: (-s ours) am 4e3a924f: Do not merge - pulled from master Be more restric...
authorPatrick Scott <phanna@android.com>
Mon, 17 Aug 2009 19:44:03 +0000 (12:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2009 19:44:03 +0000 (12:44 -0700)
commitf0d228b0dc316fea5a466dbf8e6ef3f5aeafeaca
tree0c10c1a6cc75730e6420e6549cb6d8c1e36bf8d7
parent726cbbc81385999cfe6aa3510ed7098f2bab767c
parent5a8e1d54a100b72b47732643ebeba62487be2eb3
am 5a8e1d54: (-s ours) am 4e3a924f: Do not merge - pulled from master Be more restrictive when expanding iframes.

Merge commit '5a8e1d54a100b72b47732643ebeba62487be2eb3'

* commit '5a8e1d54a100b72b47732643ebeba62487be2eb3':
  Do not merge - pulled from master