OSDN Git Service

Reconcile with internal master.
authorXin Li <delphij@google.com>
Mon, 12 Feb 2018 18:22:34 +0000 (10:22 -0800)
committerXin Li <delphij@google.com>
Mon, 12 Feb 2018 18:50:50 +0000 (10:50 -0800)
commitc1fbeb7414adc72fc8c7c106f1a09a897264d785
tree286e8ae76dbc86841983dab2ac71bc4fd4f6dd51
parent47e9e995a19606813416f90ab251f4d08acfeb8d
Reconcile with internal master.

Change-Id: I035118d746f9f969da8ba59b22b416aa65b6a2d6
Merged-In: I22e9b32ccbd4886cf1f4d35650d40a2a770f72e8
default.xml