Conflicts: docs/html/sdk/installing.jd Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
Bug: 2160782 Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221