OSDN Git Service

resolved conflics for merge of 54201120 to jb-mr2-dev
authorDirk Dougherty <ddougherty@google.com>
Thu, 18 Jul 2013 01:44:03 +0000 (18:44 -0700)
committerDirk Dougherty <ddougherty@google.com>
Thu, 18 Jul 2013 01:44:03 +0000 (18:44 -0700)
commite0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54
tree330964d2304e782aabcebe5bab56bcc0e6b6a17b
parente874bd351f7b68cead889f55afba505fb5fac97c
parent54201120705064fb62f7b31aa20c66c7ea681519
resolved conflics for merge of 54201120 to jb-mr2-dev

Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
docs/html/index.jd