am 067ecd95: resolved conflicts for merge of 7d088644 to klp-modular-dev-plus-aosp

Browse Source

* commit '067ecd95d60f00da186c117e7cb437693872d416':
  Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]

...

This commit is contained in:

Ying Wang

2014-05-31 16:58:25 +00:00

committed by Android Git Automerger

parent d386a80716 067ecd95d6

commit 96907bb2db

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available