summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-27 20:21:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-27 20:21:48 +0000
commitdc63edf43b4b143bc8aa542593175234406630fb (patch)
tree5864ea3aebc4e625ce0ec81ce6a6d63110d38d1f /data
parent04f61ee85da93f2d15034f290faec7512c176d59 (diff)
parent34c1df3a154abb8bd495f74f5e53b91e7956e596 (diff)
downloadframeworks_base-dc63edf43b4b143bc8aa542593175234406630fb.zip
frameworks_base-dc63edf43b4b143bc8aa542593175234406630fb.tar.gz
frameworks_base-dc63edf43b4b143bc8aa542593175234406630fb.tar.bz2
am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '34c1df3a154abb8bd495f74f5e53b91e7956e596': Pass correct extras to the custom print options activity
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions