OSDN Git Service

am 2a2524d2: Merge change If686b999 into eclair-mr2
authorPatrick Scott <phanna@android.com>
Fri, 4 Dec 2009 19:12:59 +0000 (11:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 19:12:59 +0000 (11:12 -0800)
Merge commit '2a2524d2c288155a0e88d67257f6428b79efda7f' into eclair-mr2-plus-aosp

* commit '2a2524d2c288155a0e88d67257f6428b79efda7f':
  Pass up flags for the main resource and user gesture.


Trivial merge