commit | c1b2be34d2f6b0323f733990e495991fd1a342bb | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Aug 14 21:11:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 21:11:19 2015 +0000 |
tree | 756089aaa5a332634aed2f7b5b429546972e7c73 | |
parent | d9a99a624684336e46b20dc19515e4ecdcbd60f4 [diff] | |
parent | 3d87934560b95560b9dc07e2e5c1f49c00369597 [diff] |
am 3d879345: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev automerge: d7b3609 * commit '3d87934560b95560b9dc07e2e5c1f49c00369597': DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop