tree d70d0c89b8f3ad255a34adf4bc70f0b0ae07cfba
parent 80b32402dced361a2ea8fc4804753fe0f4ad2981
parent 9d73af09346247352cd3eea8bbc857432ced6c32
author Andreas Gampe <agampe@google.com> 1467348164 -0700
committer Andreas Gampe <agampe@google.com> 1467348164 -0700

resolve merge conflicts of 9d73af0 to stage-aosp-master

Change-Id: I984c48310e72cb509b859501cfb07258214038fa