OSDN Git Service

Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
authorLucas Dupin <dupin@google.com>
Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)
commit6ee8fc2347b46e5092f8f6a334b4a95aae803895
treeafd0f6c2fb797816232e7ccc84f36b21c30e2c92
parent0d2c7dace32a711b8467740dafa8946e8faffd1c
parentdf83b8cfcf5327f83e1de75848502436a4c0e082
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
am: df83b8cfcf

Change-Id: Id2b3ebf54192171f81028da83469a9efdc2840ea