| commit | b24e1aa6fe599c56c9e37e962237ed19f29737bb | [log] [tgz] |
|---|---|---|
| author | Alan Newberger <alann@google.com> | Thu Oct 09 01:55:59 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 09 01:55:59 2014 +0000 |
| tree | ca51a920bf20a524c95b2f322946d40cfeefc741 | |
| parent | 345fd4a5fc7702d49b802a707712a4366714229b [diff] | |
| parent | 9652134e6e1b312e348ed3565343741239907f11 [diff] |
Merge "resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp" into ub-camera-haleakala