OSDN Git Service

am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)
commit72e3fc1d37d38fcc09134be786e0f64a174a6ece
tree5a64720a796605c91a0d609b59fe6e54fa97c8d9
parentf75f33d33be9704a09de3de967c24ecb376ca4fb
parent6f58831c64d01df7e0a80bcb47b54ea7a53a2e14
am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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