John Reck d04d303e5d resolved conflicts for merge of 1f6c973b to master ...

Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd

2014-05-23 13:56:35 -07:00

..

java

resolved conflicts for merge of 1f6c973b to master

2014-05-23 13:56:35 -07:00

jni

resolved conflicts for merge of 1f6c973b to master

2014-05-23 13:56:35 -07:00

res

am eae1e094: am 810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev

2014-05-23 18:04:24 +00:00

tests

Merge "Consolidate the language-switching logic"

2014-05-23 09:15:16 +00:00