OSDN Git Service

Merge "Sort and reorganize clear_vars.mk to make merges easier" am: e26036ad5e
authorDan Willemsen <dwillemsen@google.com>
Tue, 13 Dec 2016 22:34:39 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 22:34:39 +0000 (22:34 +0000)
commit54fcb1a61fed275b22c52dbbeb3a7aa3f236666f
treec963c82f50515126d1f352c16706512dddda991e
parentbb84f65d5b8f912120f8984bdbeebe2854b1e4b9
parent0ab11a22bae3e6b465b8ec712f643c0b9b44e080
Merge "Sort and reorganize clear_vars.mk to make merges easier" am: e26036ad5e
am: 0ab11a22ba  -s ours

Change-Id: I63808e7bd913d228a586e5ffce1373f3b5ec541e