tree cbc9e9d0383d88f67bc3d27ad8cc985d14311079
parent 2c5453e5ce88ff3ef5ca65d40ef124cb5cdcea56
parent 3d678ad462ee237d86efd9d985eb518817761e05
author Adam Powell <adamp@google.com> 1397690820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397690820 +0000

am 3d678ad4: (-s ours) am 973ddaac: DO NOT MERGE Add isRound to WindowInsets

* commit '3d678ad462ee237d86efd9d985eb518817761e05':
  DO NOT MERGE Add isRound to WindowInsets