tree c01b593cafd2be0791365995d50baf84c6ea1591
parent 1a825e9e8390cc78dd41cf9e176f5500879ddb09
parent d4f509040db39cd63ea80090e5e59f65f12e6e14
author Dmitry Shmidt <dimitrysh@google.com> 1478729880 +0000
committer android-build-merger <android-build-merger@google.com> 1478729880 +0000

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

Change-Id: I84117ba3defbf997285614462b122d976b324a43