| commit | 87c544526c1e775a7fb37275bb762d0f1b6c2faa | [log] [tgz] |
|---|---|---|
| author | Jeremy Walker <jewalker@google.com> | Mon May 16 17:05:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 16 17:05:56 2016 +0000 |
| tree | 10d0e6fe8b22371ad1dec1d00489f41c395253b7 | |
| parent | b72aec3bd590a735afb9079df9037a7b2c17af8f [diff] | |
| parent | 204b36d5fa482c954d73cc8e0c093e4071211585 [diff] |
Merge "Adds simple complication sample from I/O code lab (w/o use of Oli\'s library) for public release after code lab." into mnc-docs am: 842a9d5003 am: d5dc92e4f6 am: 204b36d5fa * commit '204b36d5fa482c954d73cc8e0c093e4071211585': Adds simple complication sample from I/O code lab (w/o use of Oli's library) for public release after code lab. Change-Id: I1e7f5d71121ff64887b013fe36f70d9672d89048
diff --git a/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java b/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java index d191e77..e2853b3 100644 --- a/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java +++ b/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
@@ -757,4 +757,4 @@ } -} \ No newline at end of file +}