tree e83c06e294da4f7611324fce351a48a6e7c0b21d
parent 69de69c6ea8075bf3ad7a3f2cf4c8c7c07abc938
parent 280937459c580290f1f0dffe7cb984a7c5bae2a5
author Alex Vakulenko <avakulenko@google.com> 1449785232 -0800
committer Alex Vakulenko <avakulenko@google.com> 1449785342 -0800

Merge 'weave/master' into 'weave/aosp-master' and restoring Android.mk

Merged master into aosp-master and put back Android.mk which has been
added to and then deleted from master.

Change-Id: Ie07899c6554f49231a8fd229c7ca06140b9e1a95