Rubin Xu 61ea6d0bbf Merge "Clarify javadoc for SecurityLog" into nyc-dev

2016-02-24 10:31:36 +00:00

..

java

Merge "Clarify javadoc for SecurityLog" into nyc-dev

2016-02-24 10:31:36 +00:00

jni

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

2016-02-23 22:43:53 +00:00

res

Merge changes from topic \'notification\' into mm-wireless-dev

2016-02-23 21:40:52 +00:00

tests

Make getBatteryUptimeLocked protected so it can be mocked.

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