tree c61c727f887eeb6865066f306ac8d029cb64871a
parent 8d887d89e8b38572c80c0db53f9bc969a3496026
parent 311ecba9818a6b09a0061a3f3fae84043f333f40
author Rob Carr <racarr@google.com> 1461793010 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461793013 +0000

Merge "Fix crash when docking." into nyc-dev