tree 954b9a2a55fb5153abc1cf7cb4c49271ceac7fb8
parent dfb7841f3176096fb28cd935eb24342472a4b44e
parent c3118041df74124c5b8b8d769354bb0ca4c5ac19
author Jeff Vander Stoep <jeffv@google.com> 1494514127 -0700
committer Jeff Vander Stoep <jeffv@google.com> 1494514216 -0700

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

Bug: 36508258
Bug: 37319524
Test: build and boot Marlin
Change-Id: Ib31a900ac70919835bcfc6bf9f6938a7aec622c2