tree 58c9c3b6c5838d9f02a7b31cc0401cc006e48e52
parent 00d43d4dd182cc4ed525f5ac62774bd19b516a95
parent 8141d27f91c87e0f0e0b7e4efc0710affe0b31e3
author Dan Albert <danalbert@google.com> 1478128663 +0000
committer android-build-merger <android-build-merger@google.com> 1478128663 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master am: 65c0aaa266
am: 8141d27f91

Change-Id: I56c10228cdd193fc7fdf208382ff791c11509773