tree 93c66a830edd405fe09de48bdbb910a12bf0d705
parent 2f288fecb457ddaf0280c44a8efd9c1a90f5fce6
parent c4cebd697250841293cd915471949953d4f2aaf2
author Dan Willemsen <dwillemsen@google.com> 1477019459 +0000
committer android-build-merger <android-build-merger@google.com> 1477019459 +0000

Merge remote-tracking branch 'aosp/upstream' into master
am: c4cebd6972

Change-Id: Ie788813f5dcb1196f08db80df90b44efbb73e039