OSDN Git Service

Merge "Fix issues #6103378 and #5959515."
authorDianne Hackborn <hackbod@google.com>
Tue, 6 Mar 2012 18:34:18 +0000 (10:34 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Mar 2012 18:34:18 +0000 (10:34 -0800)

Trivial merge