| commit | 35f3cf874e7858e4036dc26cef6e525721715629 | [log] [tgz] |
|---|---|---|
| author | dmitrygr@google.com <dmitrygr@google.com> | Thu May 08 18:36:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 18:36:37 2014 +0000 |
| tree | 4c775c405cd5cf3996ef9567ad82e412818ea940 | |
| parent | 1715234d67c17d1d157f610529b5e03da7d9bd74 [diff] | |
| parent | 3e50ae9ebaa73308160fdd297341638f18768e4f [diff] |
am 026d35e4: am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp * commit '026d35e49cc40a88ab135ac6994b7c57533bab79': DO NOT MERGE: change preloaded classes