OSDN Git Service

Merge "Fix compilation errors due to 2 independent changes."
authorTor Norbye <tnorbye@google.com>
Fri, 28 Jan 2011 20:55:40 +0000 (12:55 -0800)
committerAndroid Code Review <code-review@android.com>
Fri, 28 Jan 2011 20:55:40 +0000 (12:55 -0800)
commit25b8d66cfa4f21444ff64f626b9efc3fb7b9ef5b
treebf5bd715242a79cd9d63cfd5e805dd5aa3ea5893
parenta23400726c6e785792cc12858075fc936b8b71de
parent2e97908089f76b4c270f018cbd2e1762511df183
Merge "Fix compilation errors due to 2 independent changes."