tree 5d5a19f9f8d044a91cb69c1658830ecbb9d6a900
parent 9f475a6e10ed7345feed76ad3a1086222271a8fa
parent 31e3aab1fdb2183d783951dd19f1f9c159b64ffe
author Dmitry Shmidt <dimitrysh@google.com> 1481060375 +0000
committer android-build-merger <android-build-merger@google.com> 1481060375 +0000

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

Change-Id: If6b47f5752ad6217a8e7437710aa9d274a9791e2