commit | 057779af45a29c1c488150370964bf9526ceb954 | [log] [tgz] |
---|---|---|
author | Ben Murdoch <benm@google.com> | Thu Apr 01 08:42:14 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 01 08:42:14 2010 -0700 |
tree | 3e97de9342e02549a42f7de706763a5431ebe916 | |
parent | b346d80e8c8ffc62ca15306d72cdca4b74d33c67 [diff] | |
parent | 09806e4578b627f5dcacc8b0f4c917064120147f [diff] |
Merge changes Ic9531e3c,I3f04433b into froyo * changes: Cherry pick from master. Cherry pick from master.