track local latinime

Change-Id: I2eb93a22770556fc20910abf3966a7b3d04ed23c
Merge branch 'jb-devel-mr2-release' of github.com:codefireXperiment/android_manifest into jb-devel-mr2-release
Merge branch 'jb-devel-mr2-release' into jb-devel-mr2-staging

Conflicts:
	default.xml

Change-Id: I73e211d77768b7d27de27c137ab0c1c18654f4c7