OSDN Git Service

resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 12:23:28 +0000 (12:23 +0000)
committerNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 12:29:50 +0000 (12:29 +0000)
commitc1375f6991a79781899fda3c3f9d471654562d3d
tree565dfac6b18d7398615b0844a7adb060b5649802
parent6a7699d5c62d1696305f8debf4c0f90a34ad6009
parent084209e27848eb91e0174e3583eafef3561aac24
resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp

Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
CleanSpec.mk