OSDN Git Service

Merge "resolved conflicts for merge of f00ee0f7 to master"
authorKonstantin Lopyrev <klopyrev@google.com>
Wed, 11 Aug 2010 04:49:04 +0000 (21:49 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Aug 2010 04:49:04 +0000 (21:49 -0700)
commitea5282cf908251c4df19cee7eff63a0662c79c8c
treee2d965f17447ba5f4b0323efd1ad9d9b745f94d6
parent9e187ed8210ddb0418e19109dd43a03928c11f57
parentecb1d5ded9afee63735dc91cfb08ada2c639d237
Merge "resolved conflicts for merge of f00ee0f7 to master"