tree d8e3cf7daa7f92feb2e6fe8d5ab57e3cdd21a486
parent a8914a00969b6942211d29fd923b0692a1b70f9a
parent 7687f25e588a0e13a2c97cc3fc948f48aee86b90
author Chong Zhang <chz@google.com> 1456519935 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456519937 +0000

Merge "Do not stop window if preserving the window" into nyc-dev