| commit | 158d6013679991434cd883ef0d2928f10528b90e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:57:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:57:43 2014 +0000 |
| tree | db443b073f7e74215a8225ab95d61fa62969da95 | |
| parent | 1922bb9cd156c80ed218300b1a1a55e6022ad92f [diff] | |
| parent | e72f2c477d18c2cc104335f9e804a8b3d09c6290 [diff] |
am e72f2c47: 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 'e72f2c477d18c2cc104335f9e804a8b3d09c6290': Remove references to non-std Java classes. [DO NOT MERGE]