tree 553cd03e09d6c1a7e2201f3a6288da21da904d0c
parent 822ff6a726056ded0496215733767a3b5d9b949f
parent 63de147f143d7181e1c6bcad721b246bf6ac4235
author Yin-Chia Yeh <yinchiayeh@google.com> 1427416514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427416514 +0000

am 63de147f: Merge "DO NOT MERGE: camera: WAR for rounding width" into lmp-mr1-dev

* commit '63de147f143d7181e1c6bcad721b246bf6ac4235':
  DO NOT MERGE: camera: WAR for rounding width