OSDN Git Service

Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
authorGlenn Kasten <gkasten@android.com>
Wed, 17 Oct 2012 21:59:40 +0000 (14:59 -0700)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 17 Oct 2012 21:59:40 +0000 (14:59 -0700)

Trivial merge