Adam Powell aa64b11020 Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev

2012-09-28 12:57:14 -07:00

..

java

Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-dev

2012-09-28 12:47:25 -07:00

jni

Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev

2012-09-28 11:14:48 -07:00

res

Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev

2012-09-28 12:57:14 -07:00

tests

Merge "Pass the originating uid to the package verifier" into jb-mr1-dev

2012-09-28 10:58:19 -07:00