| commit | affbaee9c155fa575b5ea1b1856715578226ff69 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Nov 17 19:24:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 19:24:11 2014 +0000 |
| tree | 6a6e2707c64137b910c2ffb73617d1aedbea3999 | |
| parent | 8a88db1bee61adbc8bfcb679da00b8fdc539c771 [diff] | |
| parent | c2045047735522f50bc1d2618280bd37306f18d2 [diff] |
am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp * commit 'c2045047735522f50bc1d2618280bd37306f18d2': Move preloaded-classes out of framework.jar.