tree bc99bbcc9120d725358804efb10d023fa12c4379
parent 4e5cc1c801816460cf10d8bb0cae201a0e1c9725
parent 3f84453c83b4c5d11ae0159e6d22f25865eb1fe4
author Daniel Xie <dxie@google.com> 1442964164 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442964164 +0000

am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage

* commit '3f84453c83b4c5d11ae0159e6d22f25865eb1fe4':
  DO NOT MERGE ANYWHERE: fix breakage