OSDN Git Service

Merge "resolved conflicts for merge of 34706a4c to master"
authorDianne Hackborn <hackbod@google.com>
Sat, 25 Feb 2012 00:39:59 +0000 (16:39 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 25 Feb 2012 00:39:59 +0000 (16:39 -0800)
commite475b2cae38d39fb848ff25b8f7e3aa666618f42
treeceff349c4850df6c830d026aae4249b437b4c3ba
parent0ffc8c6ea2ec67e7f85c770e8e7b48fc9bf092a3
parent189752708cdd5d7bcba04cfbdae7794ceaabdb1f
Merge "resolved conflicts for merge of 34706a4c to master"