tree 48613ef787df298166c79090eecb8bb554fd3dad
parent 1cda3744fc911b720a03fead2c49aa29a0b480c8
parent d25c60fa4394170c4ac5abaa93d10c0fc01b70e7
author Dan Willemsen <dwillemsen@google.com> 1507144377 +0000
committer android-build-merger <android-build-merger@google.com> 1507144377 +0000

Merge remote-tracking branch 'aosp/upstream' am: cb8359888b am: fe3f1e0dae
am: d25c60fa43

Change-Id: I4f3d68cc15f705d6f386516379ef165d242c4c79