OSDN Git Service

resolved conflicts for merge of a2407de1 to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)
commit7439c5c0608137bb9bd7524cd54687422743652b
treeefef614c563653c502295d61de85a11ac073b811
parent2b0d868bcee5121abbe37ce10bf35f50371495a7
parenta2407de14ad40f4b5462cd6294bc4a7a07d47d38
resolved conflicts for merge of a2407de1 to mnc-dev-plus-aosp

Change-Id: Iaf366cec9606c8fed79ec00ac2573f2298de199c