| commit | dbfd29d85503b4a9e4a75ae74186623705749bac | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:08:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:08:59 2014 +0000 |
| tree | 2e9d60ea3e493395559cbfc541151c31b9077c53 | |
| parent | 74503f66e0cb5a4ea617c4a66882e8c33e5cc888 [diff] | |
| parent | 81ff5ba73f5c5c098cf4d2f46f360852bccf63da [diff] |
am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev * commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da': Remove references to non-std Java classes. [DO NOT MERGE]