OSDN Git Service

Merge "keep frames associated with regular hits and direct hits" into froyo
authorCary Clark <cary@android.com>
Tue, 6 Apr 2010 20:17:25 +0000 (13:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Apr 2010 20:17:25 +0000 (13:17 -0700)
commite5b1750d38ff2208c180fe357355bf7e23e1d97d
tree01ae1fd1409f0aaa4cadf43663535e278274feb6
parent3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0
parentbe312690095b3ccc1f52336b69c11bf42d4eb9e5
Merge "keep frames associated with regular hits and direct hits" into froyo