tree a0e5eb92d6ee2c57110ba247bb9568e39e9dc087
parent 81462faf058284633b0c37f3e9aff2419013ed5f
parent 0cb277ef878e9627787c2845e86abb2c99be85b7
author Lalit Maganti <lalitm@google.com> 1538062844 +0100
committer Lalit Maganti <lalitm@google.com> 1538063007 +0100

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

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd