tree 4b51a20d95c122b50c1263dc5a2e9414a482b36d
parent 979853943c7d10b85daf9effa453c5bd54635904
parent ef30a2a8312b83985a8ad3eb8feebbb944cbae01
author Sunny Goyal <sunnygoyal@google.com> 1426551610 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426551610 +0000

am ef30a2a8: (-s ours) [DO NOT MERGE] Fixing build error in launcher_protoutil_lib

* commit 'ef30a2a8312b83985a8ad3eb8feebbb944cbae01':
  [DO NOT MERGE] Fixing build error in launcher_protoutil_lib