OSDN Git Service

resolved conflicts for merge of 15621f64 to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 11:35:04 +0000 (12:35 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 11:35:04 +0000 (12:35 +0100)
commit8338f6ed07165dbfd54eb09e00ad84fb53ca8b10
treeeb87b7704ef10d7de26e2444c85a76aafd90931b
parent170430749969b6210a834fcfb308f37b0fde3523
parent15621f645e743124d89c7cbbb5f4becfdd94d8d6
resolved conflicts for merge of 15621f64 to mnc-dev-plus-aosp

Change-Id: I1fc73beebbf842f494b2b414dee2e5d8a2fa5794