| commit | 96907bb2db8383d06970a5d23163bfcbc50f8089 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat May 31 16:58:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 31 16:58:25 2014 +0000 |
| tree | bf0eea1c4fcfa4e74f10d61edf157f48f1816acc | |
| parent | d386a8071665150c3d08677f795042b75c66687f [diff] | |
| parent | 067ecd95d60f00da186c117e7cb437693872d416 [diff] |
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]