tree b34cf4c404fa7fb15eba9c97fd0de2a49e27f6c1
parent 067535edb4861800584785d8307c04417c022d20
parent c81c9b558b9b25f6af417bd5686ed1d73fec3392
author Dan Willemsen <dwillemsen@google.com> 1491617577 +0000
committer android-build-merger <android-build-merger@google.com> 1491617577 +0000

Merge remote-tracking branch 'aosp/upstream' into master am: e36ad10ea3 am: 5b402de009 am: 56d21ac56a
am: c81c9b558b

Change-Id: I6a21b180447c7d22f28f871e6b8c50fe7e664710