tree ef9687ce8473433b048c69ad75535f251adf617a
parent b2c628f8eaa71e0af11de2a2dc15b2e4e9d93629
parent 8e6a8004808fbbf782812a6cd75324a7008cc610
author Sunny Goyal <sunnygoyal@google.com> 1466622117 +0000
committer android-build-merger <android-build-merger@google.com> 1466622117 +0000

Merge \"Fixing potantial context leak code path\" into ub-launcher3-calgary
am: 8e6a800480

Change-Id: I13661a761cc4294e2a3e498532a926502f56b730