tree 3e85bd82b5a0d8fd3d267d177a9511469817c939
parent a8a7c612c3db5af1ffd5f5e13587341387591f54
parent 6125590925677a6fc09007d835616ba59044885d
author Luis Hector Chavez <lhchavez@google.com> 1469216645 +0000
committer android-build-merger <android-build-merger@google.com> 1469216645 +0000

Merge remote-tracking branch \\\\'weave/master\\\\' into \\\\'weave/aosp-master\\\\' am: 7aaba04460 am: 50cf4188d8 am: 9454fc7df0
am: 6125590925

Change-Id: I5381d0e6c3ff6b735068072c2cbf205d90f74893