Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
Conflicts: docs/html/sdk/installing.jd Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6