OSDN Git Service

resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)
commitd9799072de47ecd3e6d4cdb2bfd3db75f4d94bd5
tree1660c41dfda961f593906bf8c9431af38b6407da
parentb93bca5d0831068cd599f905ba43dc8334095d65
parente9b6f1f7bb590a3f9845a150c1e9286c8ad48bfe
resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp

Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8