ea37d9b489
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp * commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c': Fix bug 2670395 and 2599698