tree 069ca0f41171ebbab4049215740f76988b8e64b6
parent 307a2b59ba9666c071f5c5b03f58700e7c28ea35
parent def7185cf19d48c95b50c2b83503d5cd21a613bf
author Jean-Michel Trivi <jmtrivi@google.com> 1269645458 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269645458 -0700

Merge "Cherry-picking this fix into Froyo." into froyo