Roshan Pius c49a5f37c8 Merge "Fix a bug in ControllerActivityCounter" into nyc-dev ...

am: 85eb7a9

* commit '85eb7a97ef59a83f45208737ac83d4b3ea8f7a2c':
  Fix a bug in ControllerActivityCounter

2016-03-16 15:11:56 +00:00

..

java

Merge "Fix a bug in ControllerActivityCounter" into nyc-dev

2016-03-16 15:11:56 +00:00

jni

Merge "Remove all non-porterduff xfermodes from the public API" into nyc-dev

2016-03-16 12:17:16 +00:00

res

Import translations. DO NOT MERGE

2016-03-16 08:30:51 -04:00

tests

Merge "Stop automatically creating selection action mode." into nyc-dev

2016-03-15 07:41:07 +00:00