| commit | e90bf1d15da0c356458293477f2d8e4225c39860 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jul 21 19:21:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 21 19:21:41 2014 +0000 |
| tree | 6079edee872b2d7da9237931bb4756b4ddbe268d | |
| parent | be6dff513e41f56980dbc41cb667167be95453f7 [diff] | |
| parent | 97742073ca1e7bf1a98b43a83142e8e850e57d3e [diff] |
am 97742073: resolved conflicts for merge of 5554c0c0 to lmp-dev-plus-aosp * commit '97742073ca1e7bf1a98b43a83142e8e850e57d3e': Make ART fail gracefully when it can't update the desired code.