Commit c4343697 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am 99356bda: Merge "Enable / disable CMS runtime options." into ics-mr1-plus-art 

* commit '99356bda':
  Enable / disable CMS runtime options.
parents 96b66700 99356bda
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