OSDN Git Service

resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Wed, 9 Apr 2014 09:03:41 +0000 (10:03 +0100)
committerNarayan Kamath <narayan@google.com>
Wed, 9 Apr 2014 09:03:41 +0000 (10:03 +0100)
commit8af7e8ed3ecdfdf06d251c37c0cedfe340ffe18a
treef48c6bdbd2aa5e4e222ed11ad8c8ba54b93d494b
parent049808e3263bb347e6a1eced99b348f98174c636
parent1852237a1bb4483e16d8991e1b6118cacb5afcbe
resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp

Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
CleanSpec.mk
core/Makefile
core/config.mk