temp reset to 39, and keep history
android-merger [Tue, 12 Jul 2011 22:15:28 +0000 (15:15 -0700)]

Trivial merge