commit | 2fe22807310ed70ece83f77ebacd9ef5be0da259 | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Mon Oct 31 23:18:57 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 23:18:57 2016 +0000 |
tree | 52cd55785da6bad1ec6d80cb983c1a0b089e7cec | |
parent | 36edfc5a6ce2257b8e6c50ea697319bdaccad1f5 [diff] | |
parent | ea18c3c039afecfa720b46d6caf9240ddf664ef2 [diff] |
Merge "Camera API1: relax the fps check with some margin" into nyc-mr1-dev am: 123efa3d1b am: 8748caecbf am: ea18c3c039 Change-Id: I76db3bed952f81b27312f90477e1339a909ae053