commit | cf6c6d2ebbe39e67b38921298269a1390554cd99 | [log] [tgz] |
---|---|---|
author | Alex Vakulenko <avakulenko@google.com> | Thu Dec 10 14:11:43 2015 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 10 14:11:43 2015 -0800 |
tree | e83c06e294da4f7611324fce351a48a6e7c0b21d | |
parent | d00be2c3a4f57189724c402caa6aa0d259cc4b03 [diff] | |
parent | 2411590b716d16540e8018dfb4382d4c57812f27 [diff] |
Merge \'weave/master\' into \'weave/aosp-master\' and restoring Android.mk am: 2411590b71 * commit '2411590b716d16540e8018dfb4382d4c57812f27': Remove Android.mk from the master branch