| commit | df7b20bd0c5b64d945f999fc9eb48b8cd4262127 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:41:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:41:36 2014 +0000 |
| tree | 8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59 | |
| parent | 403cc2f9e5cfbf27527bd58c647d8f48a72ed418 [diff] | |
| parent | 0ac96e704597533ca702d082ac9d4857e5a80723 [diff] |
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 '0ac96e704597533ca702d082ac9d4857e5a80723': Remove references to non-std Java classes. [DO NOT MERGE]