tree e6fe11d68d801382512432c92b447cfc2c78e70a
parent a26404a1a6d7ea9644f967321628b6637d43b24e
parent 1f45e0859e0c15b456f53f7c5aeb625a461ca6ec
author Dan Willemsen <dwillemsen@google.com> 1475638990 +0000
committer android-build-merger <android-build-merger@google.com> 1475638990 +0000

Merge remote-tracking branch 'aosp/upstream' into master am: 1b68243cf2 am: f80f337f16
am: 1f45e0859e

Change-Id: I23815513d619124aca677d36edf16d2e22730297