tree c01b593cafd2be0791365995d50baf84c6ea1591
parent f23fbc6dfff46ed9f9251c8d73fb2109ecc87982
parent cceee343eebe75736aecec7b78e3b78235ee585c
author Dmitry Shmidt <dimitrysh@google.com> 1478729526 +0000
committer android-build-merger <android-build-merger@google.com> 1478729526 +0000

Merge "Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950""
am: cceee343ee

Change-Id: I31d6742447a0d78d89dba1ae8bc88e4d190a76f0