OSDN Git Service

resolved conflicts for merge of 4d01d08c to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:28:43 +0000 (10:28 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:28:43 +0000 (10:28 -0700)
commit846be3ea5d71bc69744747d19b0a9b0dcee4c376
tree1a9ee7b217b62eccfccb7510d7ec52c082194a47
parentcd7890ba2d0297f3857d65a29fe65da409ccc319
parent4d01d08c2935980fbd9de2d7699230db11074453
resolved conflicts for merge of 4d01d08c to lmp-mr1-dev-plus-aosp

Change-Id: Icaf503240281596de05ee331457200b61d57ab46