tree b45bca9afb3b3b454c73ba2e850fce192331f98e
parent e6ac3a4efc8464b32831c5c85d7d2be3c4212392
parent 4ff3cf1eca71e61896a6f4a493974113656f3fd5
author fionaxu <fionaxu@google.com> 1498078251 -0700
committer fionaxu <fionaxu@google.com> 1498078251 -0700

resolve merge conflicts of 4ff3cf1eca71 to stage-aosp-master

Change-Id: Id8b10a739e6a313d74908d7fd7068d53ccf994a5