tree e5197912a1c6bb8292a007494028c86c0e0815ea
parent 17d3485757eaa99be96ea71d5f15901211547e62
parent 111c83579a165fe9d8f915cda4e08de47e16c056
author Hyunyoung Song <hyunyoungs@google.com> 1430434568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430434568 +0000

am 111c8357: Removes code that is incompatible with google3, Velvet build rules.

* commit '111c83579a165fe9d8f915cda4e08de47e16c056':
  Removes code that is incompatible with google3, Velvet build rules.