OSDN Git Service

resolved conflicts for merge of 79a55d35 to klp-ub-dev
authorScott Main <smain@google.com>
Tue, 10 Dec 2013 22:04:30 +0000 (14:04 -0800)
committerScott Main <smain@google.com>
Tue, 10 Dec 2013 22:04:30 +0000 (14:04 -0800)
commitecff92d9f7d58b619465259213d7a58ae01c2872
treead522e74d9622726d2ac534bc60dc2c94f206426
parentea64d5de02842233b3a163c9c707cc77ce06483c
parent79a55d358563ca7414902603653f39464991d000
resolved conflicts for merge of 79a55d35 to klp-ub-dev

Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
tools/droiddoc/templates-sdk/sample.cs