OSDN Git Service

Merge "resolved conflicts for merge of 6a828712 to master"
authorAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)
commit165e6c01cab2c8d395493f93a4270c1cc24a2901
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parentaac54b54b0b01aecc0a8be3d338b051a2939843b
parent152ecbcbfd3541610caf47981a13261d3fc0cc7d
Merge "resolved conflicts for merge of 6a828712 to master"