16d77b8d42
Merge commit 'c162668e870cda9d336741f24c177cd925fef8e0' into froyo-plus-aosp * commit 'c162668e870cda9d336741f24c177cd925fef8e0': More framework tests cleanup.