OSDN Git Service

resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp
authorGriff Hazen <griff@google.com>
Wed, 21 May 2014 03:05:08 +0000 (20:05 -0700)
committerGriff Hazen <griff@google.com>
Wed, 21 May 2014 03:05:08 +0000 (20:05 -0700)
commit0413efd261c9e6103ec65ff60af3ef22dfc80d19
tree9f6e83dad739acad54c5ab9e5c7b69b3cd92520a
parent2f4c0a8617e75a8aa28ba898c9213422aa7e93f0
parent3bb81eb04dbf05a33d1ba1a77b0593c80be44a2e
resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp
CleanSpec.mk