tree 5d5a19f9f8d044a91cb69c1658830ecbb9d6a900
parent b3712de6f918e75ae06f779ff2588cd1695f2e4d
parent d890b54af9b6e7e552b4f9bc3b6a12cbccef1f0e
author Dmitry Shmidt <dimitrysh@google.com> 1481060827 +0000
committer android-build-merger <android-build-merger@google.com> 1481060827 +0000

Merge "Cumulative patch from commit ed0a4ddc22526361a138c6b145561fcaac24e2a5" am: 21c780dfa7 am: 31e3aab1fd am: ca30bea46b
am: d890b54af9

Change-Id: I80984e5f0d606a5ee1338d0afe4eb42b29ef2a40