Alan Viverette d3b13eb3ef Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev ...

am: 5249bd296d

* commit '5249bd296df1a91bc3bc0009d067321f1c119866':
  Fix exit transition and dismiss callback for popup exit transition

2016-02-24 23:33:52 +00:00

..

java

Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev

2016-02-24 23:33:52 +00:00

jni

Merge "Audio record notification: report client/device configuration" into nyc-dev

2016-02-24 17:14:12 +00:00

res

Merge "Fix the title of the language selection list" into nyc-dev

2016-02-24 23:32:12 +00:00

tests

Make getBatteryUptimeLocked protected so it can be mocked.

2016-02-23 13:28:03 -08:00