tree 84890f9aab3a8990ec3c15001e95608eb7a6c044
parent e5743753eee8da6019594a95d2c27881599a0582
parent fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8
author Svetoslav <svetoslavganov@google.com> 1422333397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422333397 +0000

am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev

* commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
  Add a missing file to print spooler resources