tree 08e04d481548ae3daee0e89ddf72a8d913048950
parent 1ab03c6b2beb5da9178ac0aa93659a135b574f1f
parent 2bc5c995f6d75faab7e4fd1b40cbe25e61209b1f
author Tony <twickham@google.com> 1501805179 -0700
committer Tony <twickham@google.com> 1501805179 -0700

Merge commit 'refs/changes/84/2659484/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-860fd7dd-f3a3-4500-8fc2-78d473322b94

Change-Id: I0b39a20cee47d4aba4a033196db3df78b2357b7b