OSDN Git Service

am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:47:35 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:47:35 +0000 (18:47 +0000)
commit443019c36af8ee9bb5def50cb882d3cdda024d85
tree55c0e9f3d64997cdafc20e130ce03f13b03727ab
parentf26504308af3f63f8732cfc1c738456d046486ca
parentdf7b20bd0c5b64d945f999fc9eb48b8cd4262127
am df7b20bd: am 0ac96e70: 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 'df7b20bd0c5b64d945f999fc9eb48b8cd4262127':
  Remove references to non-std Java classes. [DO NOT MERGE]