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

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

2012-10-11 17:18:25 -07:00

..

java

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

2012-10-11 17:18:25 -07:00

jni

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

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

res

Merge "Import translations. DO NOT MERGE"

2012-10-10 21:19:55 -07:00

tests

Fix build, only invalidate when creating user.

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