Dianne Hackborn fc31380adf am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev ...

* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
  More on issue #7318666: hide developer options from user build

2012-10-11 17:10:54 -07:00

..

java

am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev

2012-10-11 17:10:54 -07:00

jni

am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev

2012-10-11 00:15:57 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-10-10 21:16:53 -07:00

tests

Fix build, only invalidate when creating user.

2012-10-10 00:01:26 -07:00