Alan Viverette d9c37653d9 Fix build ...

Change-Id: I595d4e1b4a044a454c77526696c7edc70ac57f88

2014-05-13 19:11:33 -07:00

..

java

Merge "Pass ActivityOptions back from finishing activity."

2014-05-14 00:54:41 +00:00

jni

camera2: Update native<->managed camera metadata marshalers

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

res

Fix build

2014-05-13 19:11:33 -07:00

tests

Replace LinkCapabilities with NetworkCapabilities

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