Felipe Leme 34cc5c0e48 Merge \\"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am: c1374208e3\\" into nyc-mr1-dev am: b1400b142e ...

am: 62e46e8899

Change-Id: Id8aed75038fed88c8c11a1d953726712b7005c62

2016-06-28 20:59:55 +00:00

..

java

Merge \\"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am: c1374208e3\\" into nyc-mr1-dev am: b1400b142e

2016-06-28 20:59:55 +00:00

jni

Merge \\"Fix SurfaceViewPositionListener race bugs\\" into nyc-mr1-dev am: 8701bff9ba

2016-06-28 01:36:19 +00:00

res

One final tweak to the platlogo. am: 4b7e415803 am: 3fae8ae0c6

2016-06-28 08:20:34 +00:00

tests

Merge "Delete gender-balanced emoji sequence by one backspace key event."

2016-06-28 06:54:58 +00:00