commit | 4be1107c5aa4f5eb2c0ddf783d0b85240579c76b | [log] [tgz] |
---|---|---|
author | Ruben Brunk <rubenbrunk@google.com> | Tue Sep 01 20:35:02 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:35:02 2015 +0000 |
tree | a8e79f6eeab9038311deaef2e89074bc543620dc | |
parent | b73ec5bd5c973f074fc2236e03d351f2fc10f9bb [diff] | |
parent | 19e73380b00eb55461d258eaf2bf38e05dfe78e6 [diff] |
am 19e73380: 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 '19e73380b00eb55461d258eaf2bf38e05dfe78e6':