OSDN Git Service

resolved conflicts for merge of 66189de6 to master
authorJoe Fernandez <joefernandez@google.com>
Tue, 9 Dec 2014 21:58:23 +0000 (13:58 -0800)
committerJoe Fernandez <joefernandez@google.com>
Tue, 9 Dec 2014 21:58:23 +0000 (13:58 -0800)
commitead7b78b9eb303115c93f393160a3d91e1e89fab
tree9248e7465d96ad82bd897b98c282b0cd08a76d13
parent3bf22c31e8053d0de9cfaddcc76fab77c33c9091
parent66189de6f8624c1c3f3c66121c1dabe5e51bd852
resolved conflicts for merge of 66189de6 to master

Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
docs/html/sdk/index.jd
docs/html/sdk/installing/migrate.jd
docs/html/tools/eclipse/index.jd
docs/html/tools/studio/index.jd