OSDN Git Service

resolve merge conflicts of ff3341b to stage-aosp-master
authorEvgenii Stepanov <eugenis@google.com>
Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)
committerEvgenii Stepanov <eugenis@google.com>
Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)
commite6350dfdddc0ce9cc1a62d01782ae48ffba74f64
treeaf22ddb794c5b7a936ba6c29c19f6e7e007dc269
parentdb9f3489bcad4408b3521c9b1c242e41e4ccff99
parentff3341b33bac9ab20427a0c7bd489f87caf8f663
resolve merge conflicts of ff3341b to stage-aosp-master

Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
core/clear_vars.mk