tree 2e64d49145cb20859413a8cda38999a114d53fa4
parent cc7917d0ee984fca49fe18b280a9f42947736fbd
parent 6497dd732565f4cadfe0e808d3075de95ecff80e
author Mark Renouf <mrenouf@google.com> 1414850855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414850855 +0000

am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev

* commit '6497dd732565f4cadfe0e808d3075de95ecff80e':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE