aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-12-10 14:11:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 14:11:43 -0800
commitcf6c6d2ebbe39e67b38921298269a1390554cd99 (patch)
treee83c06e294da4f7611324fce351a48a6e7c0b21d
parentd00be2c3a4f57189724c402caa6aa0d259cc4b03 (diff)
parent2411590b716d16540e8018dfb4382d4c57812f27 (diff)
downloadlibweave-brillo-m8-release.tar.gz
Merge \'weave/master\' into \'weave/aosp-master\' and restoring Android.mkbrillo-m8-release
am: 2411590b71 * commit '2411590b716d16540e8018dfb4382d4c57812f27': Remove Android.mk from the master branch
0 files changed, 0 insertions, 0 deletions