OSDN Git Service

Merge "resolved conflicts for merge of 05683c85 to master"
authorEric Laurent <elaurent@google.com>
Thu, 19 Jan 2012 18:52:46 +0000 (10:52 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 Jan 2012 18:52:46 +0000 (10:52 -0800)
commit67398176f1da61626eff50493726da978b2a7476
treef51ab2224dac6fd980a461c51fef2e9c0ca10333
parent273b8d5c12098448b4c003f5401ee277a130747c
parentb64e824cd26e376953ff3726fb26b0251d9dc987
Merge "resolved conflicts for merge of 05683c85 to master"