tree 93c66a830edd405fe09de48bdbb910a12bf0d705
parent c6c38778a3b3d1b5828dedf1276757fd981023a3
parent 7dda54cd2bf12fb79dd9c44265757008fb816a90
author Dan Willemsen <dwillemsen@google.com> 1477020479 +0000
committer android-build-merger <android-build-merger@google.com> 1477020479 +0000

Merge remote-tracking branch 'aosp/upstream' into master am: c4cebd6972 am: fa51372f9f
am: 7dda54cd2b

Change-Id: I08964e5ec9cee50898d496e860ff0ef81ca00da4