Nicolas Prevot f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev ...

* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.

2015-01-14 19:24:16 +00:00

..

java

am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev

2015-01-14 19:24:16 +00:00

jni

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-09 17:19:45 -08:00

res

Import translations. DO NOT MERGE

2015-01-12 09:07:58 -08:00

tests

am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

2015-01-12 16:44:36 +00:00