Jeff Brown 1fd1d493c9 am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev ...

* commit '397aca12c9d5ffaddab0fc70a05b8cb443f04a75':
  Fix inconsistency in user activity types.

2012-07-27 18:21:37 -07:00

..

java

am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev

2012-07-27 18:21:37 -07:00

jni

Merge "Rename drawGeneralText to drawText" into jb-mr1-dev

2012-07-27 16:42:52 -07:00

res

Import translations. DO NOT MERGE

2012-07-26 13:55:40 -07:00

tests

Merge "Update WifiManager API"

2012-07-25 12:25:13 -07:00