commit | 73b10e8be49236f747f6593bf959af84eddbcc74 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:02:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:02:20 2015 +0000 |
tree | 4ffa10c4fbb4d49fddbb9768a1c69a66c272474f | |
parent | 0d57c935ee1bf9777ce4db6e007331f4d9e7c29e [diff] | |
parent | 56e870e07d7b4e244be27b0fb34e8dba0789d9d6 [diff] |
am 56e870e0: am 9ef5cda3: am 28886e99: am 9e45aaac: am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours * commit '56e870e07d7b4e244be27b0fb34e8dba0789d9d6':