tree fb252339c6147e8882816d5c87e0e3843ccec49a
parent cd2d6d909543196844cd8365be59383425f2804f
parent 0eea822c79308473c37795e0c3360c36ed8802c4
author Jiyong Park <jiyong@google.com> 1525144556 +0900
committer Jiyong Park <jiyong@google.com> 1525144556 +0900

resolve merge conflicts of 0eea822c79308473c37795e0c3360c36ed8802c4 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3324639b033d20617736c6d532a9c919cbb39d96