| commit | 4ce553d2be2258c0f0f380534580101ef8abac94 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Sep 22 20:01:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:01:39 2015 +0000 |
| tree | f743879f8d921f434e35c5bf285e8ad91d4f0f5e | |
| parent | 39482cfa790ae8733f4b2632a1ba4ccc9df544fe [diff] | |
| parent | eb0d7931ab35161956a1bd1dca731f7dbfc2d90b [diff] |
am eb0d7931: (-s ours) am 703266a4: (-s ours) am 6b7071ff: (-s ours) am d7b36097: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev * commit 'eb0d7931ab35161956a1bd1dca731f7dbfc2d90b':