OSDN Git Service

Merge "Sort and reorganize clear_vars.mk to make merges easier" am: e26036ad5e am...
authorDan Willemsen <dwillemsen@google.com>
Tue, 13 Dec 2016 22:42:10 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 22:42:10 +0000 (22:42 +0000)
commit7695288ca3d006093798035d96761b83b1c91d41
tree88c2ca809de62bea1fe19cc6ffa4a12b7162ae86
parent88c5ae9c9a716944cddbf384f0c84e1234f16bb5
parent54fcb1a61fed275b22c52dbbeb3a7aa3f236666f
Merge "Sort and reorganize clear_vars.mk to make merges easier" am: e26036ad5e am: 0ab11a22ba  -s ours
am: 54fcb1a61f  -s ours

Change-Id: I797e4c49148018b9d828632a11dc35dfa9c95b11