tree 2589cf0e008350aae3ff73700cfd164465ecceff
parent 36af8c3c6dad56c8414dca03e95c6e5ff3927544
parent 910d3822691eb7dd54124b800bd2c3e8a99f3968
author Tao Bao <tbao@google.com> 1438127883 -0700
committer Tao Bao <tbao@google.com> 1438127883 -0700

resolved conflicts for merge of 910d3822 to mnc-dr-dev-plus-aosp

Change-Id: I2c899be9d6a82664e4d14c903311daeed5e546fd