OSDN Git Service

resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Tue, 27 May 2014 11:21:22 +0000 (12:21 +0100)
committerNarayan Kamath <narayan@google.com>
Tue, 27 May 2014 11:21:22 +0000 (12:21 +0100)
commit06db73241a12a6b5f352647e966d254ae6443f68
treec6d29522ec3549a7cf201605cd595c882d746176
parentbcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d
parent0f99bb3d0bb358e79be85b54823792ec2c198b8b
resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp

Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
CleanSpec.mk