Dave Burke 38996cdcf1 am 236cc476: Temporarily revert field name change (DO NOT MERGE) ...

* commit '236cc476e6792a11502ba4f40c7ab4586f40d282':
  Temporarily revert field name change (DO NOT MERGE)

2013-05-06 11:11:51 -07:00

..

java

am 236cc476: Temporarily revert field name change (DO NOT MERGE)

2013-05-06 11:11:51 -07:00

jni

Temporarily revert field name change (DO NOT MERGE)

2013-05-06 00:21:30 -07:00

res

Import translations. DO NOT MERGE

2013-05-03 10:59:40 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00