tree b1dcbdad97fc3d634a6423bf2259d00270bf88eb
parent 3c9653ea9e372ada9bc284263627c9b3eff7b673
parent d68725cd20be0c1d5ebd583da5fde0f007a69bf8
author Sunny Goyal <sunnygoyal@google.com> 1426270586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426270586 +0000

am d68725cd: Fixing build error in launcher_protoutil_lib

* commit 'd68725cd20be0c1d5ebd583da5fde0f007a69bf8':
  Fixing build error in launcher_protoutil_lib