OSDN Git Service

resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp
authorRoland Levillain <rpl@google.com>
Mon, 29 Jun 2015 13:28:23 +0000 (14:28 +0100)
committerRoland Levillain <rpl@google.com>
Mon, 29 Jun 2015 13:29:02 +0000 (14:29 +0100)
commit4a666d3892c0b5f5d969a0ad71208f2253068e97
treefdd9c7e01ace3d1f75290f6f68bcb1d737f066cc
parentac53d430bb114711fc1b1ea5032b5fcfcd934dad
parent1107c8f3ab5871b0067f5d089bb57dc4e4720e8c
resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp

Change-Id: Id084ba7a4c95479696b0b414dbd29a68b9e7d02c