tree 0492134293219d60ad74bb18c745c35f685269f6
parent a785a7e6667209a1a5488c2cb40bbb6400c7ca2c
parent bb09721c7cacd2dddbf8200598886caf7f897208
author Cody Northrop <cnorthrop@google.com> 1520024047 -0700
committer Cody Northrop <cnorthrop@google.com> 1520024047 -0700

Merge remote-tracking branch 'aosp/upstream-master' into 20180302-merge-android_layers_to_master

Change-Id: I5b213c9c6e83929a921f9f2bae17a98d294745d2