tree d95b043b641aa85f53ec1a9e88bcb10204031c0a
parent a7db12072db8cf07e44d70c85ca49a2660cf94c0
parent 9de88673037b72f55a24fb8399b3e906b68709c9
author Yin-Chia Yeh <yinchiayeh@google.com> 1439832871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439832871 +0000

am 9de88673: (-s ours) am f7f53ecc: (-s ours) am c1b2be34: (-s ours) am 3d879345: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev automerge: d7b3609

* commit '9de88673037b72f55a24fb8399b3e906b68709c9':
  DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop