Ed Heyl 2cf184233b merge master nova by hand, skipped translations ...

Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb

2014-05-14 13:24:53 -07:00

..

java

merge master nova by hand, skipped translations

2014-05-14 13:24:53 -07:00

jni

camera2: Update native<->managed camera metadata marshalers

2014-05-13 15:28:24 -07:00

res

merge master nova by hand, skipped translations

2014-05-14 13:24:53 -07:00

tests

Replace LinkCapabilities with NetworkCapabilities

2014-05-12 16:52:56 -07:00