OSDN Git Service

resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp
authorJustin Koh <justinkoh@google.com>
Tue, 4 Feb 2014 23:16:15 +0000 (15:16 -0800)
committerJustin Koh <justinkoh@google.com>
Tue, 4 Feb 2014 23:16:15 +0000 (15:16 -0800)
commitbbfebfad0d8ad002995bb1005b61a35b42a8ce35
tree58a1adf3f4825db9b955e738cfeb68469c035b3c
parent47f9b9bc290dae448f07101c1fb6629285973514
parent303d275591a4a73ac0a6ca49f4396f6a0d994095
resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp

Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
CleanSpec.mk