diff options
author | Zhijun He <zhijunhe@google.com> | 2015-02-08 21:04:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-02-08 21:04:38 +0000 |
commit | f7f131105d479d30b53b2366e29278fd09f36065 (patch) | |
tree | d1da8f6a21a1da0055c011c43ea4b3dc735e2323 /core/java/android/content/AsyncTaskLoader.java | |
parent | a8b341cdf00e169beb944c0205c98977f835424e (diff) | |
parent | 07c745b525d39309a9ea93605fb5f85c295502f1 (diff) | |
download | frameworks_base-f7f131105d479d30b53b2366e29278fd09f36065.zip frameworks_base-f7f131105d479d30b53b2366e29278fd09f36065.tar.gz frameworks_base-f7f131105d479d30b53b2366e29278fd09f36065.tar.bz2 |
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
automerge: 07c745b
* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
camera-metadata: clarify the AE precapture trigger spec
Diffstat (limited to 'core/java/android/content/AsyncTaskLoader.java')
0 files changed, 0 insertions, 0 deletions