OSDN Git Service

am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp...
authorCraig Mautner <cmautner@google.com>
Thu, 17 Jul 2014 20:57:42 +0000 (20:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 20:57:42 +0000 (20:57 +0000)
commit1e4603547ad62e4267f7b249f757a8874d3c5788
tree5cc4c592fde7872170dbe76b44482bd540237de7
parent0db75fe2b01d96f4c0367ad90717f0c22b92a665
parentdea2119f33932fc8a753b19af9bc7bb2cdb600d7
am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev

* commit '96de06e63e63fa66c4c5b419164c74b512d00ae8':
  Wait for all windows to draw before turning screen on