tree 16b68a65b75fa320a3fb539d92705c94b22a34dc
parent 0c42d4b31de3ee36c483c830b137829d134b02ce
parent d4f49b07d1b4b80da2e1234b2e9a37eb6a50ba55
author Colin Cross <ccross@android.com> 1465495452 -0700
committer Colin Cross <ccross@android.com> 1465496578 +0000

Merge remote-tracking branch 'aosp/upstream' into master

3a17686 Merge remote-tracking branch 'aosp/upstream' into master
d4f49b0 Merge pull request #103 from colincross/parser
e32cc80 Refactor blueprint parser nodes to an interface
aedd490 Merge pull request #101 from colincross/doc
7932496 Fix documentation property type for pointers
d9f6fd5 Remove naming stutter in bpdoc
017ed2e Fix govet issues

Change-Id: Ie0863b79ee0d22ae6dbc066ca06303f046d904b7