OSDN Git Service

resolved conflicts for merge of 132004f8 to master
authorsmain@google.com <smain@google.com>
Tue, 9 Dec 2014 22:14:11 +0000 (14:14 -0800)
committersmain@google.com <smain@google.com>
Tue, 9 Dec 2014 22:14:11 +0000 (14:14 -0800)
commit2b08f538d1618b764a952e355b778046da085bde
tree6a8244e4a9d598558d1be3dd286231a5a1a1aacb
parent5f7d05f3e060f441c5a0c38d483b704ecd5d8994
parent132004f8692d5574c4c60ce739022cdd87925944
resolved conflicts for merge of 132004f8 to master

Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82
docs/html/sdk/index.jd