Esteban Talavera 31638de305 am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev ...

* commit '07b36bd3bfa3e4f723e38f2c6cb011da942aa73a':
  Remove uids with empty history from NetworkStats uid enumeration

2015-08-17 15:07:12 +00:00

..

java

am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

2015-08-17 15:00:04 +00:00

jni

am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

2015-08-16 01:34:42 +00:00

res

am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 02:48:19 +00:00

tests

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00