OSDN Git Service

Merge "resolved conflicts for merge of a0f011ff to master"
authorMathias Agopian <mathias@google.com>
Wed, 8 Dec 2010 06:57:04 +0000 (22:57 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Dec 2010 06:57:04 +0000 (22:57 -0800)
commit222ae987aab180b960aac382926c69458b5a2812
tree3162f410a33c201134f0b81f23bb777fb9f13d28
parent0de74e0268ff5031a9e06d571e4bab75cf69550e
parenta1aa18fc267a7d2db99b3cbc39907127bcdf6ac6
Merge "resolved conflicts for merge of a0f011ff to master"