tree 96beaf07307486f6491f022da63ebe381765d1a8
parent a83129f0bc778fd1ccd799bd8cfa40270f632e1d
author Hyunyoung Song <hyunyoungs@google.com> 1437523286 -0700
committer Ed Heyl <edheyl@google.com> 1437589864 -0700

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b