commit | 19e73380b00eb55461d258eaf2bf38e05dfe78e6 | [log] [tgz] |
---|---|---|
author | Ruben Brunk <rubenbrunk@google.com> | Tue Sep 01 20:20:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:20:28 2015 +0000 |
tree | 987574a480911572297417d281c1f86193d3973f | |
parent | e33de576446af8c2ee1027eefcc62370414207b3 [diff] | |
parent | 1fa662f1b5bd57ad20b9b21461609eb9ef9d02b3 [diff] |
am 1fa662f1: am 4bc3c04f: am 413bb326: am 9fa98ec5: am 8759a70a: am 2b375543: Merge "camera2: Fix makefile for ITS in CTS build." into lmp-sprout-dev * commit '1fa662f1b5bd57ad20b9b21461609eb9ef9d02b3':