summaryrefslogtreecommitdiffstats
path: root/tests/LegacyRestoreTest
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2015-01-29 02:13:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-29 02:13:35 +0000
commitd31cafb369c48a41bc149833659fad894e7bf59f (patch)
tree3f3951cc4b990356cb35c4edc4553d4c2b83e286 /tests/LegacyRestoreTest
parent448080dcbc771c71623b4a360fb4b51ecddfb973 (diff)
parentcf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b (diff)
downloadframeworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.zip
frameworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.tar.gz
frameworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.tar.bz2
am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
automerge: cf8ae79 * commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b': Change getDeviceId to take phoneId.
Diffstat (limited to 'tests/LegacyRestoreTest')
0 files changed, 0 insertions, 0 deletions