tree 4771dd6ac654bde57b50bec41a959d2a0afa8555
parent fa51372f9f43c97993376f149ba674538a347f95
parent 7e2a7c776b73857214538760ab6aa08c6c831486
author Dan Willemsen <dwillemsen@google.com> 1477040269 +0000
committer android-build-merger <android-build-merger@google.com> 1477040269 +0000

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

Change-Id: I4f70289cdfb25d8d42ce0424c0473df8eea5260a