diff options
author | Zhijun He <zhijunhe@google.com> | 2015-02-08 21:23:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-08 21:23:05 +0000 |
commit | 0b039b031557d77e112e88925904e9668f764aa7 (patch) | |
tree | f03318591f6aa1dba447fabb44ac834a98415c2e /libs/hwui/RenderState.h | |
parent | 843b2c7aa9e38f39732a279d7901f66893b37ab7 (diff) | |
parent | 9f8e82ed968115d14a564397c6b316af3ba42caf (diff) | |
download | frameworks_base-0b039b031557d77e112e88925904e9668f764aa7.zip frameworks_base-0b039b031557d77e112e88925904e9668f764aa7.tar.gz frameworks_base-0b039b031557d77e112e88925904e9668f764aa7.tar.bz2 |
am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
* commit '9f8e82ed968115d14a564397c6b316af3ba42caf':
camera-metadata: clarify the AE precapture trigger spec
Diffstat (limited to 'libs/hwui/RenderState.h')
0 files changed, 0 insertions, 0 deletions