tree b5b063f15e04f37198acd3d8a94374a6f67f7253
parent 0a6305d5ddf7ca628b36bb65077d44e3ea139be4
parent 81a28efd1b16cf908b308265aa75d17fece17a11
author Tyler Gunn <tgunn@google.com> 1488386672 -0800
committer Tyler Gunn <tgunn@google.com> 1488386672 -0800

resolve merge conflicts of 81a28efd1b16 to stage-aosp-master

Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d