tree d4a7749f9af826d4efb6d36f65ff09d01c4f29c9
parent fb9f8d06d90cbce130242e86911a38287bcfb6ae
parent 4fabf1dd41a28135b40d4a33c78a080f86161e36
author Winson Chung <winsonc@google.com> 1432248717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432248717 +0000

am 4fabf1dd: Merge "Fixing crash in previous CL." into ub-launcher3-burnaby

* commit '4fabf1dd41a28135b40d4a33c78a080f86161e36':
  Fixing crash in previous CL.