| commit | f09110409432e21494f89221284ccd3f4404fab7 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Apr 05 20:23:53 2016 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Tue Apr 05 20:33:38 2016 -0700 |
| tree | fb002e74b3cd1b5b65f7c502356864e377dcec11 | |
| parent | 049d382f23bae257d8cf2dd2303eb2c3a166b932 [diff] | |
| parent | 95207a700ac94fe94f2dce1be96c785c89054f5a [diff] |
Merge branch 'mnc-mr-docs' into mnc-ub-dev Large merge to reconnect automerger for docs branch to mainline. Conflicts: media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java media/Camera2Basic/README.md media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java media/Camera2Video/README.md media/MidiSynth/template-params.xml Issue: 28000173 Change-Id: I1fe910677f9505caeca1a6bbc7ca508c414ec839