tree d4f45559b95127150e90e01b74ed30e0027a6fcd
parent 79c6a425c787b00c5a139234275b666990c5bd0a
parent cf0195ec230cf3a0dac9340d774e73e06a2f65ce
author Yang Ni <yangni@google.com> 1452893332 -0800
committer Yang Ni <yangni@google.com> 1452893332 -0800

resolve merge conflicts of 70171ef802 to mnc-dr2-dev-plus-aosp.

Change-Id: I49b3580d19015d76083b1ed98e468fd55b3c55d7