tree e11df53362f37b67eec03ec59c149ae055c28a5c
parent 9b99a971f651902cf3d3e46b3e506d12247a97de
parent 61eb51b8f5fb9d747ce5e06c0799f81ff8ddac16
author Vinod Krishnan <vinodkrishnan@google.com> 1402708673 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402708673 +0000

am 61eb51b8: (-s ours) am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev

* commit '61eb51b8f5fb9d747ce5e06c0799f81ff8ddac16':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows