| commit | 097c9fb1e8850521502efabd41b22daa5e2fbf2c | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Thu Oct 23 10:24:23 2014 -0700 |
| committer | Sascha Haeberling <haeberling@google.com> | Thu Oct 23 10:24:23 2014 -0700 |
| tree | cb9567e5bbd195560e2b009d1f5c2e59dac2a9cf | |
| parent | dff4bbdd81a63a3861c5ff288630a84458e39f01 [diff] | |
| parent | 5aad0cb47483e4896303cff3a84547dd83948cf8 [diff] |
Merge commit '5aad0cb4' into stuff1 Conflicts: src/com/android/camera/CameraActivity.java src/com/android/camera/one/OneCameraManager.java Change-Id: I9495daa600356ffcef21bba506dc5a3fce365af3