tree bf0eea1c4fcfa4e74f10d61edf157f48f1816acc
parent d386a8071665150c3d08677f795042b75c66687f
parent 067ecd95d60f00da186c117e7cb437693872d416
author Ying Wang <wangying@google.com> 1401555505 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401555505 +0000

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

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