summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/values-my-rMM
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2015-02-08 21:29:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-08 21:29:18 +0000
commit6de4c8827111ea32d036a7071e3cdc85343cc5d4 (patch)
tree30630caf29b1e12b0d1c5ce7ac461dea0018f18e /packages/SystemUI/res/values-my-rMM
parent6bfe8325b98869392f35d5fc8ea3bd29c538dad8 (diff)
parent0b039b031557d77e112e88925904e9668f764aa7 (diff)
downloadframeworks_base-6de4c8827111ea32d036a7071e3cdc85343cc5d4.zip
frameworks_base-6de4c8827111ea32d036a7071e3cdc85343cc5d4.tar.gz
frameworks_base-6de4c8827111ea32d036a7071e3cdc85343cc5d4.tar.bz2
am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
automerge: 0b039b0 * commit '0b039b031557d77e112e88925904e9668f764aa7': camera-metadata: clarify the AE precapture trigger spec
Diffstat (limited to 'packages/SystemUI/res/values-my-rMM')
0 files changed, 0 insertions, 0 deletions