OSDN Git Service

resolved conflicts for merge of de01780f to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Wed, 22 Oct 2014 17:13:08 +0000 (10:13 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Wed, 22 Oct 2014 17:13:08 +0000 (10:13 -0700)
Change-Id: Ibed1ba1f52da7222f534011866515cfce790061f


Trivial merge