OSDN Git Service

Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
authorAndrew Solovay <asolovay@google.com>
Mon, 30 Oct 2017 18:02:54 +0000 (18:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Oct 2017 18:02:54 +0000 (18:02 +0000)
commitd18e375ece52aa0bf451a2e443afbe3e00037a0e
treec5ca92887e1297bf5e4cb0313ca437a440f4c16a
parent8590d905cb185b5b055ec122745bb02ad6c6b6ef
parentddad5593c2429e7b3d9f793ae94fc52070744f96
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
am: ddad5593c2

Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559