tree 148c5221b8f54a997d505d0db23593363f4cf0e2
parent 101b2bb4b734c84af46c69e6ea750adc40d824cc
parent f23fbc6dfff46ed9f9251c8d73fb2109ecc87982
author Dmitry Shmidt <dimitrysh@google.com> 1478718823 +0000
committer android-build-merger <android-build-merger@google.com> 1478718823 +0000

Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950" am: c15e6e5191
am: f23fbc6dff

Change-Id: I63c6c66c0078b170af26915102bc6ae1048c7852