tree ab517e0c8736f27bc5ab1e8854afa16c83504a65
parent 287321d1641ca4c41bc456c45b8f08ee4575dab6
parent 4743a0864950575cd357b734ef1dd806c95ad238
author Vitaly Buka <vitalybuka@google.com> 1446861352 -0800
committer Vitaly Buka <vitalybuka@google.com> 1446861352 -0800

Merge remote-tracking branch 'weave/master' into aosp-master