tree 7117bb10e12c8b6dd882c424fef827c43a8eb787
parent 1931304e710aadb4098cfb94daa4458e64cf0515
parent e6e2f6658a6fe97eaa0afda2881f928a0227720c
author Ying Wang <wangying@google.com> 1443250158 -0700
committer Ying Wang <wangying@google.com> 1443250158 -0700

resolved conflicts for e6e2f665 to mnc-dr-dev-plus-aosp

Change-Id: I3f2b6918a6f052e9ed426784ad34eb25ef6683b4