OSDN Git Service

resolved conflicts for merge of 93c3f420 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:05:02 +0000 (10:05 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:05:02 +0000 (10:05 -0700)
commitabf6390f37b6d541fa3d26583fc8506047b50de8
tree1a9ee7b217b62eccfccb7510d7ec52c082194a47
parent88eb2a9cf5f2c71bdd73d36ff7dbc29a655cb1ec
parent93c3f4203c92ece8b97d770af9b675f5ffb90c67
resolved conflicts for merge of 93c3f420 to lmp-mr1-dev-plus-aosp

Change-Id: I3cd9c572ec096dc14e0356fe2725074bc7af29d3