| commit | af6dcd4f956b74e1af8f3558412bbc847d4bcd71 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:19:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:19:05 2014 +0000 |
| tree | 1ce19922396c657ebbc4d4da545cfa976999429d | |
| parent | 5dce0a4b3d933e5d7174ba487fd180b6165d2923 [diff] | |
| parent | 48e3d0fac84657f14991cbb14b23fb229a4f6362 [diff] |
am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev * commit '48e3d0fac84657f14991cbb14b23fb229a4f6362': Remove references to non-std Java classes. [DO NOT MERGE]