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