tree 561e10f3ff0342053fb31aeebff9ca62fd48d199
parent 23dfd922a6f53dc829c5765ef4a687d967f98244
parent bbb41a7097c44a6dbfe1a7ee369037b4f11c745b
author Tao Bao <tbao@google.com> 1438362069 -0700
committer Tao Bao <tbao@google.com> 1438362069 -0700

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

Change-Id: Icc2ed1632cf023785ddfbae09478ea0ffb025167