tree 178ed774338215470158cf16b7d18d97d8abd381
parent e060be32312751a2a06b9672545e6ad1154e0d00
parent 22a0475f414a18a6d28c27cc8d2ff831f0259daf
author Vitaly Buka <vitalybuka@google.com> 1446862583 -0800
committer Vitaly Buka <vitalybuka@google.com> 1446862714 -0800

Merge remote-tracking branch 'weave/master' into aosp-master
Undo deletion of Android.mk happened on master branch.

Change-Id: I05ba2937cd98755d205e0a777e4f7d13899eb238