| commit | 72e3fc1d37d38fcc09134be786e0f64a174a6ece | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:57:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:57:41 2014 +0000 |
| tree | 5a64720a796605c91a0d609b59fe6e54fa97c8d9 | |
| parent | f75f33d33be9704a09de3de967c24ecb376ca4fb [diff] | |
| parent | 6f58831c64d01df7e0a80bcb47b54ea7a53a2e14 [diff] |
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]