tree c01b593cafd2be0791365995d50baf84c6ea1591
parent ddcd037d0cb6550aa86e00e6eda53b6713d37436
parent 1373972f5340cfbcea67e1cf8f44209920e76b93
author Dmitry Shmidt <dimitrysh@google.com> 1478730215 +0000
committer android-build-merger <android-build-merger@google.com> 1478730215 +0000

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

Change-Id: I92a4dbc74f7db567ca1ff2089ad14d148dbf6979