Conflicts: docs/html/sdk/installing.jd Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
5f6002ec
d71c2aa1