tree 48613ef787df298166c79090eecb8bb554fd3dad
parent fded9df0282181e14e4ea2113b20a1469a2363b7
parent fe3f1e0dae00797138a663cb7bfa8913ccf76de4
author Dan Willemsen <dwillemsen@google.com> 1507144019 +0000
committer android-build-merger <android-build-merger@google.com> 1507144019 +0000

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

Change-Id: Ibac2e565e761053629c4a6965534ee526d52ada0