OSDN Git Service

resolved conflicts for merge of ff01f6fc to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:33:04 +0000 (10:33 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:33:04 +0000 (10:33 -0700)
commitde1943eb82116d879344dc17f54f7188d8119740
tree1a9ee7b217b62eccfccb7510d7ec52c082194a47
parent846be3ea5d71bc69744747d19b0a9b0dcee4c376
parentff01f6fcced83b6446136d6ddc9b3a536fab57f7
resolved conflicts for merge of ff01f6fc to lmp-mr1-dev-plus-aosp

Change-Id: I90e7700708a305a7e93dd3ef3a32c5508038b53b