tree 892ad205b3ae184a3ead966bddd7a59bc8fe4971
parent 0fcf654630768b9c29ba0d0d008e6e346856b63f
parent 674f0eb973b8ebf08f9abcb45b2271dc510aa2cf
author Alex Vakulenko <avakulenko@google.com> 1453324982 -0800
committer Alex Vakulenko <avakulenko@google.com> 1453325174 -0800

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

674f0eb9 Pull the new r369476 of base library from Chromium

Change-Id: Icde89eb14dabf86c397aa6254ba98d3af3171b42