OSDN Git Service

Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
authorRomain Guy <romainguy@google.com>
Fri, 19 Oct 2012 01:09:48 +0000 (18:09 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Oct 2012 01:09:49 +0000 (18:09 -0700)
commit8b98246559c7422e507458a63c8dfc2783bd0afc
tree08b56252a0539ea8b6f7d763bdac24c1f2aa0b49
parent8346107d25a05580fa98adaaff9d28c025d3faed
parent025cafcfa153fe0f8dab2bfe07c392ff5403d326
Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
res/values/strings.xml