summaryrefslogtreecommitdiffstats
path: root/packages/DefaultContainerService/src
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-27 19:59:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-27 19:59:10 +0000
commit34c1df3a154abb8bd495f74f5e53b91e7956e596 (patch)
tree7346bd23e90695107109b0a04795091a218f1d27 /packages/DefaultContainerService/src
parentf040100cbde4b551dd551a8b0b9eb7194116a95b (diff)
parent9124c1784d6537827a6b6423f58572395d8fb820 (diff)
downloadframeworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.zip
frameworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.tar.gz
frameworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.tar.bz2
am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '9124c1784d6537827a6b6423f58572395d8fb820': Pass correct extras to the custom print options activity
Diffstat (limited to 'packages/DefaultContainerService/src')
0 files changed, 0 insertions, 0 deletions