tree 1660c41dfda961f593906bf8c9431af38b6407da
parent b93bca5d0831068cd599f905ba43dc8334095d65
parent e9b6f1f7bb590a3f9845a150c1e9286c8ad48bfe
author Dmitriy Ivanov <dimitry@google.com> 1418256644 -0800
committer Dmitriy Ivanov <dimitry@google.com> 1418256644 -0800

resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp

Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8