tree bcc46bfc986ef5b36ef5866b440a03417a3cc14d
parent 479de8779ef74c0976f81cba00492aa17cfb6c36
parent 610520ad206fcb886c6c09f763f434caac8531ff
author Tao Bao <tbao@google.com> 1438884091 -0700
committer Tao Bao <tbao@google.com> 1438884091 -0700

resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp

Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063