tree d38081027431ec370280fc3b5e95a406dc428ec4
parent 75785e9413f44101431171da2c3ab4b0bc60f7f7
parent 1df986c21ee52c6756846b4a5e45cb316f772112
author Brian Carlstrom <bdc@google.com> 1288636922 -0700
committer Brian Carlstrom <bdc@google.com> 1288636922 -0700

Merge commit '1df986c21ee52c6756846b4a5e45cb316f772112' into gingerbread-release-to-dalvik-dev