tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent 96edc4c8d0e9cf24c59b83157c3d57a47e839e49
author Hyunyoung Song <hyunyoungs@google.com> 1437595342 -0700
committer Ed Heyl <edheyl@google.com> 1437595588 -0700

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

Change-Id: Iec5916b2323d0fb36b4d619da9e6c4e0d57a9b56