Lenka Trochtova e8a4797e00 Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev ...

am: cfdc99ef5e

* commit 'cfdc99ef5e542f61cd405132fc140b14d9ec1620':
  Prevent ephemeral user from being re-entered after stop.

2016-02-24 12:38:00 +00:00

..

java

Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev

2016-02-24 12:38:00 +00:00

jni

Merge "Support running AVD on UI thread" into nyc-dev

2016-02-23 23:01:46 +00:00

res

Merge changes from topic \'notification\' into mm-wireless-dev am: 2339b786c7

2016-02-23 21:46:30 +00:00

tests

Make getBatteryUptimeLocked protected so it can be mocked.

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