tree c01b593cafd2be0791365995d50baf84c6ea1591
parent 4ec151381db5726982e0706f76f08325888dec30
parent d54c40d52e92951128f046cd99105948fa610934
author Dmitry Shmidt <dimitrysh@google.com> 1478730612 +0000
committer android-build-merger <android-build-merger@google.com> 1478730612 +0000

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

Change-Id: I2d0ff022aabc9f357bb719fb0250fadb9dedac8f