tree 251eadcbd285743def6bba5ad29e6480ef8fa34f
parent bdf7d94aacaa604841a385e6d8a0055cfeba4f04
parent c7a6f1e4f8ff504bf617a0415b2c43ab3d339294
author Tao Bao <tbao@google.com> 1435681992 -0700
committer Tao Bao <tbao@google.com> 1435681992 -0700

resolved conflicts for merge of c7a6f1e4 to mnc-dev-plus-aosp

Change-Id: I3201c1d7f9e8b451614259c2fec70c07ae9c8332