tree 71e24906721f452b0f4fec4cfa56df153dad5117
parent 2084083fb3f0c1f0d7936431f70ce562d2ad2885
parent bac0d879267c1980e026e1f91fe38af04f2b8712
author Todd Kjos <tkjos@google.com> 1481923898 +0000
committer android-build-merger <android-build-merger@google.com> 1481923898 +0000

Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp am: 85a19e86d0
am: bac0d87926

Change-Id: I6b2e0cf609bed4e046b37a00d52665a8aece12a6