OSDN Git Service

am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:19:05 +0000 (18:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:19:05 +0000 (18:19 +0000)
* commit '48e3d0fac84657f14991cbb14b23fb229a4f6362':
  Remove references to non-std Java classes. [DO NOT MERGE]


Trivial merge