tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent cf51139c6e1d57b57177109f2177edc41edf5bbc
parent 13ef17a37e683b8ad5800e9f542b411180fbec2f
author Hyunyoung Song <hyunyoungs@google.com> 1437711877 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1437711877 -0700

resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402

Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b