Commit 06cd9298 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am c70bdbc1: manual merge - fix build 

Merge commit 'c70bdbc1' into dalvik-dev

* commit 'c70bdbc1':
  Cherry picking changes from dalvik-dev
parents 0c8300bc c70bdbc1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment