| commit | ed98abecad359ab1765ac1f698c8ba06dbd00745 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 16:31:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 16:31:28 2014 +0000 |
| tree | 14fdb73afd336b58ab0d1fc79c5207146ec2eb2b | |
| parent | 2cbe100a9bc6d2b3bf828432a1527f0ac239e575 [diff] | |
| parent | 8a70bcef5a724906e3c35c58cb2266ee9c9e1b78 [diff] |
am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp * commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78': Remove references to non-std Java classes. [DO NOT MERGE]