tree f3ff93eca1ac05e65d7b6be7d4f0b843e39bdbfb
parent 354e9d77cfb8ba513f59f4d653b81bf09adfecdc
parent 7a190cd28b291f5834ac42bed017e23ba8b26a5c
author Tri Vo <trong@google.com> 1516823842 +0000
committer android-build-merger <android-build-merger@google.com> 1516823842 +0000

Merge remote-tracking branch 'aosp/upstream-master'
am: 7a190cd28b

Change-Id: I5f1cc3af1be5a4c3b035d830ddc22d02692771ab