OSDN Git Service

Merge "Update droiddoc templates for build/make move" am: f8d8458edd
authorClay Murphy <claym@google.com>
Wed, 12 Oct 2016 19:15:25 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 19:15:25 +0000 (19:15 +0000)
am: 69c640cb2b  -s ours

Change-Id: I99ce073a3f20b221f6072f63144545d0b00abc1b


Trivial merge