tree 598753e3856253062d073ec4da99be2085962612
parent c208eb5e4cea82ea995f7091e6f92c76fea41d95
parent 50e090d607949697ae050fb86666738b3d814c08
author Dan Willemsen <dwillemsen@google.com> 1507005500 +0000
committer android-build-merger <android-build-merger@google.com> 1507005500 +0000

Merge remote-tracking branch 'aosp/upstream' am: d120bfe213
am: 50e090d607

Change-Id: I70e935e3b19373b912f503be7eb9890fdb21b118