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)
commit6a2d62c1a972da25de53b1718c165f2b7df85a0e
tree6d653ee5b01f2322e86e47820495ba141b699128
parentdbe1be24c9e6fb92a88a38adbd12a56aa5337f74
parent4cb4f7ce9184de9a221239c28afcf912e7e1ed43
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"