| commit | 99350faf733386feb95b32cffc9e2f5c738dba02 | [log] [tgz] |
|---|---|---|
| author | dmitrygr@google.com <dmitrygr@google.com> | Thu May 08 18:30:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 18:30:53 2014 +0000 |
| tree | 8d99c9491f30f4a756acd11d72e1e9b831de76fa | |
| parent | a2604b738e7298fd926482ec5d94356b37a0d807 [diff] | |
| parent | 90cfa0011243b5461644f4182a0d76d63e41610d [diff] |
am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp * commit '90cfa0011243b5461644f4182a0d76d63e41610d': DO NOT MERGE: change preloaded classes