tree 2676dec08ec9e787d93a6d180b77c09fc0a4c6eb
parent c7a6f1e4f8ff504bf617a0415b2c43ab3d339294
parent 8787cd6d4ec9e403557e17d6083bb180874fc08c
author Tao Bao <tbao@google.com> 1435799193 -0700
committer Tao Bao <tbao@google.com> 1435799193 -0700

resolved conflicts for merge of 8787cd6d to mnc-dev

Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f