tree 1629b381d37037c68755d90861a8b41d13113a58
parent b1cf6a87e431054632bfb5ec512f3c4680700f9e
parent 1ba65c7a8951d6de64d2e3582f5aa6fa4f5a0549
author Deepanshu Gupta <deepanshu@google.com> 1400006183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400006183 +0000

am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '1ba65c7a8951d6de64d2e3582f5aa6fa4f5a0549':
  Remove references to non-std Java classes. [DO NOT MERGE]