| commit | eb0d7931ab35161956a1bd1dca731f7dbfc2d90b | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Sep 22 18:13:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 18:13:30 2015 +0000 |
| tree | 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a | |
| parent | 19a41464a8dee9bf43188e82b38c2212cd7a36ec [diff] | |
| parent | 703266a47aaecf8f219a4e8bfe0554cbb8ad2e99 [diff] |
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 '703266a47aaecf8f219a4e8bfe0554cbb8ad2e99':