destradaa 92dfec090e Merge "Fix build break due to 32/64 bit compilation." into nyc-dev ...

am: 5fb90f91b7

* commit '5fb90f91b7984e61d57591880bed0257cd35d7da':
  Fix build break due to 32/64 bit compilation.

Change-Id: Ib4c3c9f30ff1a1f9b09050f9e5913798c5de91d2

2016-04-29 20:35:25 +00:00

..

java

Merge "Fixes on handling messages from apps to host." into nyc-dev

2016-04-29 19:28:15 +00:00

jni

Merge "Fix build break due to 32/64 bit compilation." into nyc-dev

2016-04-29 20:35:25 +00:00

res

Merge "Only change picker modes when used in dialog" into nyc-dev

2016-04-29 16:38:13 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:47:52 +00:00