| commit | e72f2c477d18c2cc104335f9e804a8b3d09c6290 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:53:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:53:20 2014 +0000 |
| tree | d24eb93b4db64ef97840ac995cc82afc0286b4e0 | |
| parent | 84f5beed2a4564b53b246f418f7d9ae55fccf760 [diff] | |
| parent | 443019c36af8ee9bb5def50cb882d3cdda024d85 [diff] |
am 443019c3: 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 '443019c36af8ee9bb5def50cb882d3cdda024d85': Remove references to non-std Java classes. [DO NOT MERGE]