| commit | 5c4d018437beafa654622c660e08e2817a62c28a | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Thu Oct 23 18:08:37 2014 -0700 |
| committer | Sascha Haeberling <haeberling@google.com> | Thu Oct 23 18:08:37 2014 -0700 |
| tree | d2078eb2a2101f9a02c0c388d16c9d87aa3a5f99 | |
| parent | f77470f781c85eda535a98be430b8a3d016b281e [diff] | |
| parent | 770c2b3e82326d6272b1d2f65a65e5330c951abb [diff] |
Merge commit '770c2b3e' into stuff1 Conflicts: src/com/android/camera/data/LocalSessionData.java Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd