OSDN Git Service

resolved conflicts for merge of 926797a8 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Sun, 2 Nov 2014 01:02:31 +0000 (18:02 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Sun, 2 Nov 2014 01:02:31 +0000 (18:02 -0700)
commitd3cd66185f63a75ec9f0fca69bd6594c310dbaa8
tree7fdb2c7fae628c22219cd81f973919a30a512fd3
parentb1c019f32ad5da8649b9792b8526806b1ebe2878
parent445111a1c977e94a4233efd54f3690defa4a7582
resolved conflicts for merge of 926797a8 to lmp-mr1-dev-plus-aosp

Change-Id: I3b46a714fd1236431fa08872f280e4ac4c4880d1