tree 72873d62261c7dac119db23e809208a5ac375b64
parent 43a9c969aa60115c5716c4120ee7d8d69d5d86a8
parent 64afa1aff1cd610d2493f780e2a44b551f668b84
author Jeff Vander Stoep <jeffv@google.com> 1492025482 -0700
committer Jeff Vander Stoep <jeffv@google.com> 1492033512 -0700

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

Bug: 36508258
Test: build and boot Marlin.
Change-Id: Ic5f92ad304dca23ddbfaaffd86489f3a556f9a1e